Commit Graph

1581 Commits

Author SHA1 Message Date
DeathStrikeV 3b1c5ee3a8 Updated emotes 2017-04-03 00:38:45 +01:00
pohky a17497d9a4 Merge pull request #460 from DeathStrikeV/master
More FFZ Emotes =)
2017-04-02 12:19:52 +02: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
pohky 8230b05046 Merge pull request #459 from DeathStrikeV/master
More FFZ emotes =)
2017-03-26 23:34:03 +02:00
DeathStrikeV 29c91bdfdf Updated emotes 2017-03-26 20:16:52 +01:00
pohky bd34bd6157 Merge pull request #455 from DeathStrikeV/master
More FFZ Emotes =D
2017-03-24 22:33:22 +01: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
DeathStrikeV c3450d50c4 Updated emotes 2017-03-21 21:12:00 +00:00
DeathStrikeV e4796621b7 Updated emotes 2017-03-17 00:11:29 +00:00
pohky aefd07995d Merge pull request #454 from DeathStrikeV/master
More ffz emotes
2017-03-12 16:07:18 +01: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
Alexei Stukov 897be73f09 Merge pull request #453 from DeathStrikeV/master
More FFZ emotes
2017-03-06 23:11:40 +02: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 b02340a130 Merge pull request #452 from Violetnred2/patch-1
Update emotefilter.json
2017-03-03 15:44:13 +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 72c2585e6a Merge pull request #450 from SomeGuyNamedDavid/patch-2
Blacklist emotes
2017-02-28 10:42:05 +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
Alexei Stukov 770eae466e Merge pull request #449 from Zerthox/patch-1
Add "Technical" to emotefilter
2017-02-27 13:01:31 +02: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
DeathStrikeV 717586cee1 Merge pull request #11 from Jiiks/master
Update
2017-02-23 22:38:48 +00: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
Jiiks 90fd6199a1 Merge pull request #446 from jjtcm/master
Add "Profi" to emotefilter
2017-02-14 00:55:39 +02: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 fb927b093a Merge pull request #445 from DeathStrikeV/master
Added "Seriously" to emotesfilter
2017-02-12 16:10:38 +02: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
DeathStrikeV 92e992abd2 Merge pull request #10 from Jiiks/master
Pull latest changes
2017-02-12 09:04:55 +00:00
Jiiks d8feba59ea deprecate branch 2017-02-12 00:37:49 +02:00
Jiiks 11190a8a4c Merge pull request #288 from sarnex/master
Update Linux support to 0.0.13
2017-02-10 16:00:38 +02:00
Jiiks 143602a729 More case sentivity fixes 2017-02-10 15:58:37 +02:00
Jiiks 713e9e93d3 Fixed case sensitivity for storage file 2017-02-10 15:55:13 +02:00