Commit Graph

547 Commits

Author SHA1 Message Date
DeathStrikeV 5a51afd01e Updated FFZ emotes =3 2017-05-02 20:15:17 +01:00
DeathStrikeV f01ea2473c Updated FFZ emotes =3 2017-04-27 00:56:32 +01:00
DeathStrikeV d71acb07fd Updated emotes 2017-04-24 18:36:19 +01:00
DeathStrikeV d517bae2d3 Updated emotes 2017-04-17 03:28:15 +01:00
DeathStrikeV 206685c29d Updated emotes 2017-04-09 13:34:39 +01:00
DeathStrikeV 3b1c5ee3a8 Updated emotes 2017-04-03 00:38:45 +01:00
DeathStrikeV cc64dfa958 Updated emotes 2017-04-02 10:02:31 +01:00
DeathStrikeV f7ab2a5b59 Updated emotes 2017-03-30 01:04:54 +01:00
DeathStrikeV 29c91bdfdf Updated emotes 2017-03-26 20:16:52 +01:00
DeathStrikeV c3450d50c4 Updated emotes 2017-03-21 21:12:00 +00:00
DeathStrikeV e4796621b7 Updated emotes 2017-03-17 00:11:29 +00:00
DeathStrikeV b7f46fd7f4 Updated emotes 2017-03-12 03:00:25 +00:00
DeathStrikeV 36d68836d4 Updated emotes 2017-03-10 18:35:03 +00:00
DeathStrikeV 3e89697b4f Updated emotes 2017-03-06 20:42:16 +00:00
DeathStrikeV b78666140a Updated emotes 2017-03-04 00:45:09 +00:00
DeathStrikeV 52e8bc512d Merge pull request #12 from Jiiks/master
Merge updates
2017-03-03 18:56:09 +00:00
DeathStrikeV bb50c6f48e Updated emotes 2017-03-03 18:54:54 +00: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
DeathStrikeV b6833d2962 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2017-02-26 22:37:30 +00:00
DeathStrikeV a976753b93 Updated emotes 2017-02-26 22:36:45 +00:00
Zerthox e0885c6d6a Add Technical 2017-02-24 13:47:14 +01:00
Jiiks 23724784e2 Merge pull request #447 from DeathStrikeV/master
More updated emotes =D
2017-02-23 19:41:53 +02:00
DeathStrikeV e26b1db0c4 Updated emotes 2017-02-22 00:41:28 +00:00
DeathStrikeV c687da23fe Updated emotes 2017-02-18 00:15:26 +00:00
DeathStrikeV e509f16648 Updated emotes 2017-02-17 00:32:43 +00:00
DeathStrikeV 1919061656 Updated emotes 2017-02-15 18:47:13 +00:00
jjtcm d6aabd89ae Add "Profi" to emotefilter 2017-02-13 18:45:55 +01:00
DeathStrikeV 406ced863f Updated emotes 2017-02-12 22:51:38 +00:00
DeathStrikeV 1d9e4753be Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2017-02-12 21:20:19 +00:00
DeathStrikeV aad61c5281 Updated emotes 2017-02-12 21:05:22 +00:00
DeathStrikeV 3543b57f53 Updated emotes 2017-02-12 15:29:04 +00: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
Jiiks e8e52cf7c6 Merge pull request #442 from brodycas3/master
Add Minecraft to emote filter
2017-02-10 14:52:12 +02:00
Jiiks de617fed27 Merge pull request #434 from DeathStrikeV/master
Updated emotes
2017-01-31 21:38:50 +02:00
DeathStrikeV 59c931191b Updated emotes 2017-01-31 19:16:17 +00: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
DeathStrikeV f15b0dee3d Updated emotes 2017-01-29 22:52:57 +00:00
Jiiks 513fb57621 Removed garbage 2017-01-28 03:48:36 +02:00