Commit Graph

210 Commits

Author SHA1 Message Date
Zerthox 4a33c39e8b Add "You!" 2017-05-12 21:16:36 +02:00
Alexei Stukov 0ea7990226 added Hai! 2017-05-08 16:02:04 +03:00
Alexei Stukov 1c75af3513 Merge branch 'master' into patch-1 2017-05-08 07:26:00 +03:00
David 1a367d83ba Update emotefilter.json 2017-05-01 23:57:45 -04:00
David 77d72d6284 Update emotefilter.json 2017-04-14 18:32:14 -04:00
Violetnred2 70ef5cd327 Update emotefilter.json
filtering out few extra single word emotes that does not represent their word well
2017-03-23 13:28:24 +02:00
Alexei Stukov 319e6db4fc Remove excess comma 2017-03-03 15:43:44 +02:00
Violetnred2 5c52b3b987 Update emotefilter.json
blacklist some LoL champion names plus assorted words
2017-03-03 13:58:09 +02:00
Alexei Stukov a64dfa8bf0 missing comma 2017-02-28 10:41:33 +02:00
Alexei Stukov f35e867358 Merge branch 'master' into patch-2 2017-02-28 10:40:59 +02:00
David b200229b26 Update emotefilter.json 2017-02-27 16:55:51 -05:00
David 6a86149b63 Blacklist emotes 2017-02-26 22:09:22 -05:00
Zerthox e0885c6d6a Add Technical 2017-02-24 13:47:14 +01:00
jjtcm d6aabd89ae Add "Profi" to emotefilter 2017-02-13 18:45:55 +01:00
Jiiks 01cfee0ebd Fixed indent 2017-02-12 16:10:12 +02:00
DeathStrikeV c811e2a064 Added "Seriously" to emotesfilter 2017-02-12 09:25:43 +00:00
Jiiks f7fa19dcf8 Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/424
2017-02-10 15:52:14 +02:00
Jiiks 44073ed15d Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/433
2017-02-10 15:50:16 +02:00
Jiiks 031c64271a Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/420
2017-02-10 15:48:56 +02:00
Jiiks 79d9c6f00c Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/432
2017-02-10 15:46:12 +02:00
Jiiks 391b6a2085 Merge pull request #426 from Zerthox/patch-5
Add Spooky, Spaghetti, Rucksack, Rein, Moin to emotefilter
2017-02-10 15:42:18 +02:00
Zerthox ca3859d343 Add Moin 2017-01-31 12:04:23 +01:00
brodycas3 30df5f6158 Update emotefilter.json 2017-01-29 21:23:46 -05:00
Zerthox b4bc6ff109 Add Dirk 2016-12-31 20:24:44 +01:00
Zerthox c65b760ca1 Add Spooky, Spaghetti, Rucksack, Rein 2016-12-19 19:18:31 +01:00
pohky a2de68ec1f Update emotefilter.json
Added Bella
2016-12-16 23:22:19 +01:00
Zerthox 65fda6f4e7 Added YOUTUBE 2016-12-12 20:01:55 +01:00
Zerthox e15af62927 Added Baby 2016-12-12 19:58:18 +01:00
Zerthox 1b9eb941d2 Added Affe 2016-12-09 20:59:12 +01:00
Zerthox 59263be1b5 Added Brille 2016-12-09 20:35:32 +01:00
Zerthox c0bd71fe7d Added Meow & Hartz 2016-11-21 19:57:26 +01:00
Zerthox 56773ae55f Added "Snorlax" (Broken) 2016-11-10 19:22:07 +01:00
TakosThings cc1938b14b Add "Bomb" to filter 2016-11-10 04:35:26 +10:30
Zerthox 84092e1c6f Add "Nein" and "Pokeball" 2016-11-07 21:17:28 +01:00
Jiiks c3443b5725 added Okie 2016-11-02 07:38:03 +02:00
Jiiks 48d4a58102 ayy and indent 2016-08-16 12:24:55 +03:00
pohky 501f38357f FFZ Emote Update 2016-08-16 02:32:19 +02:00
pohky eb58553ade Update emotefilter.json 2016-08-12 04:54:22 +02:00
pohky 42971a5714 Update emotefilter.json 2016-08-06 23:47:03 +02:00
pohky 7bd1a219cd Update emotefilter.json 2016-08-06 23:46:34 +02:00
pohky f751f540ec Update emotefilter.json 2016-08-04 22:13:27 +02:00
pohky bd576ef69c Update emotefilter.json 2016-08-04 16:14:20 +02:00
pohky d186bc9218 Update emotefilter.json 2016-08-03 22:22:48 +02:00
pohky ef8ca8fd15 Update emotefilter.json 2016-08-03 06:26:02 +02:00
Jiiks 9e4f6ccf25 Added some emotes 2016-08-02 19:50:14 +03:00
pohky 0ab1fe3f19 Update emotefilter.json 2016-07-25 10:31:12 +02:00
pohky 00ff05bfe0 Update emotefilter.json 2016-07-25 07:05:18 +02:00
pohky 91fcf59656 Update emotefilter.json 2016-07-22 10:22:36 +02:00
pohky 20337f3f36 Update emotefilter.json 2016-07-22 06:37:19 +02:00
pohky 7eac80b59f Update emotefilter.json 2016-07-21 00:38:22 +02:00