diff --git a/.eslintrc.js b/.eslintrc.js index 35c80a84..a3347c5c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -139,7 +139,7 @@ module.exports = { "react/jsx-first-prop-new-line": ["error", "multiline-multiprop"], "react/jsx-indent": ["warn", "tab"], "react/jsx-indent-props": ["warn", "tab"], - "react/jsx-key": "warn", + //"react/jsx-key": "warn", "react/jsx-no-bind": "error", "react/jsx-no-comment-textnodes": "error", "react/jsx-no-duplicate-props": "error", diff --git a/fontello.config.json b/fontello.config.json index d2f7c70f..ec72010e 100644 --- a/fontello.config.json +++ b/fontello.config.json @@ -669,6 +669,12 @@ "search": [ "channel-points" ] + }, + { + "uid": "4e511190b60f329d08301eb6869c5130", + "css": "fast-fw", + "code": 59453, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/package.json b/package.json index 9383e30a..1afc7d73 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.15.4", + "version": "4.15.5", "description": "FrankerFaceZ is a Twitch enhancement suite.", "license": "Apache-2.0", "scripts": { diff --git a/res/font/ffz-fontello.eot b/res/font/ffz-fontello.eot index 679fcdea..a530e495 100644 Binary files a/res/font/ffz-fontello.eot and b/res/font/ffz-fontello.eot differ diff --git a/res/font/ffz-fontello.svg b/res/font/ffz-fontello.svg index 07bd45d2..45d4f46b 100644 --- a/res/font/ffz-fontello.svg +++ b/res/font/ffz-fontello.svg @@ -128,6 +128,8 @@ + + diff --git a/res/font/ffz-fontello.ttf b/res/font/ffz-fontello.ttf index 987a77ed..e3c8f8c8 100644 Binary files a/res/font/ffz-fontello.ttf and b/res/font/ffz-fontello.ttf differ diff --git a/res/font/ffz-fontello.woff b/res/font/ffz-fontello.woff index 9ca90fdb..c397fc6b 100644 Binary files a/res/font/ffz-fontello.woff and b/res/font/ffz-fontello.woff differ diff --git a/res/font/ffz-fontello.woff2 b/res/font/ffz-fontello.woff2 index 39df3502..45068c9a 100644 Binary files a/res/font/ffz-fontello.woff2 and b/res/font/ffz-fontello.woff2 differ diff --git a/src/modules/main_menu/components/changelog.vue b/src/modules/main_menu/components/changelog.vue index 0379a2ae..0b3da255 100644 --- a/src/modules/main_menu/components/changelog.vue +++ b/src/modules/main_menu/components/changelog.vue @@ -1,10 +1,15 @@