1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-20 21:10:54 +00:00

Merge branch 'master' into socketdev

This commit is contained in:
Kane York 2015-10-27 18:26:28 -07:00
commit 2fd1817627
30 changed files with 898 additions and 139 deletions

View file

@ -27,6 +27,7 @@ module.exports = {
"\\:-?[\\\\/]": ":-/",
"\\;-?\\)": ";-)",
"R-?\\)": "R-)",
"[oO](_|\\.)[oO]": "O.o",
"[o|O](_|\\.)[o|O]": "O.o",
"\\:-?D": ":-D",
"\\:-?(o|O)": ":-O",
@ -34,6 +35,8 @@ module.exports = {
"Gr(a|e)yFace": "GrayFace"
},
EMOTE_MIRROR_BASE: SERVER + "twitch-emote-mirror/",
EMOTE_REPLACEMENT_BASE: SERVER + "script/replacements/",
EMOTE_REPLACEMENTS: {
15: "15-JKanStyle.png",