Commit Graph

459 Commits

Author SHA1 Message Date
DeathStrikeV beae2087a8 Updated emotes 2016-12-06 19:49:43 +00:00
DeathStrikeV 31a1fcfc46 Updated emotes 2016-12-05 11:13:33 +00:00
DeathStrikeV 37731b9fa7 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-12-02 21:38:41 +00:00
DeathStrikeV 2d8120fc1e Updated emotes 2016-12-02 21:38:09 +00:00
DeathStrikeV bd0e1b135e Merge pull request #8 from Jiiks/master
Update to latest
2016-12-02 10:23:05 +00:00
DeathStrikeV e40b9fe82c Updated emotes 2016-12-02 09:54:24 +00:00
DeathStrikeV bb5744dfe9 Updated emotes 2016-11-29 21:36:09 +00:00
DeathStrikeV 5bf2597030 Updated emotes 2016-11-28 23:38:15 +00:00
DeathStrikeV ade5cbc446 Updated emotes 2016-11-28 13:45:55 +00:00
DeathStrikeV 35ca5f6339 Updated emotes 2016-11-28 07:03:14 +00:00
DeathStrikeV 97c259f1c4 Updated emotes 2016-11-27 20:48:51 +00:00
DeathStrikeV 8eedc29d71 Updated emotes 2016-11-27 12:33:46 +00:00
DeathStrikeV 3975eabca0 Updated emotes 2016-11-27 11:10:46 +00:00
DeathStrikeV 1b99b6289a Updated emotes 2016-11-25 07:36:15 +00:00
DeathStrikeV 0b9fb52800 Updated emotes 2016-11-25 06:34:40 +00:00
DeathStrikeV f1a0f11257 Updated emotes 2016-11-24 09:55:07 +00:00
DeathStrikeV dea323a0b8 Updated emotes 2016-11-23 07:30:50 +00:00
DeathStrikeV 85093234fa Updated emotes 2016-11-20 09:44:32 +00:00
DeathStrikeV 13e21fb052 Updated emotes 2016-11-19 19:56:18 +00:00
DeathStrikeV e592126078 Updated emotes 2016-11-19 14:40:30 +00:00
DeathStrikeV 35de874ced Updated emotes 2016-11-18 02:00:28 +00:00
DeathStrikeV cdc95aef68 Updated emotes 2016-11-16 23:17:58 +00:00
DeathStrikeV 08cc4c5bc3 Updated emotes 2016-11-16 01:35:32 +00:00
DeathStrikeV 5c514efa96 Updated emotes 2016-11-16 01:31:48 +00:00
DeathStrikeV a9bc977764 Updated emotes 2016-11-16 00:12:44 +00:00
DeathStrikeV 2fa3e7a4b5 Updated emotes 2016-11-15 21:06:06 +00:00
DeathStrikeV 9b4f5f4366 Updated emotes 2016-11-15 07:57:48 +00:00
DeathStrikeV 2b55554af1 Updated emotes 2016-11-14 22:33:50 +00:00
DeathStrikeV 5aff38bf39 Updated emotes 2016-11-13 22:36:49 +00:00
Jiiks 53d4989a79 Merge pull request #415 from DeathStrikeV/master
More FFZ Emotes
2016-11-13 06:35:58 +02:00
DeathStrikeV 020b1b8d4e Updated emotes 2016-11-12 18:07:45 +00:00
DeathStrikeV e251a03914 Merge pull request #7 from Jiiks/master
Pull latest updates
2016-11-11 19:14:50 +00:00
DeathStrikeV 1faac18e8d Updated emotes 2016-11-11 19:14:13 +00:00
DeathStrikeV a23878fd0b Updated emotes 2016-11-11 07:29:05 +00:00
Zerthox 56773ae55f Added "Snorlax" (Broken) 2016-11-10 19:22:07 +01:00
DeathStrikeV 14331ddee5 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-11-10 07:29:45 +00:00
DeathStrikeV b1a06a519f Updated emotes 2016-11-10 07:28:27 +00:00
TakosThings cc1938b14b Add "Bomb" to filter 2016-11-10 04:35:26 +10:30
DeathStrikeV faa7b30df5 Merge pull request #6 from Jiiks/master
Update to latest changes
2016-11-08 19:53:25 +00:00
DeathStrikeV 9a638e7eb3 Updated emotes 2016-11-08 19:38:07 +00:00
DeathStrikeV 06770ca1af Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-11-08 07:31:08 +00:00
DeathStrikeV 337a79efbb Updated emotes 2016-11-08 07:29:51 +00:00
Zerthox 84092e1c6f Add "Nein" and "Pokeball" 2016-11-07 21:17:28 +01:00
DeathStrikeV 68e56d9ea8 Merge pull request #5 from Jiiks/master
Pull latest changes
2016-11-07 19:24:08 +00:00
DeathStrikeV 2e64e4c47b Updated emotes 2016-11-06 23:46:21 +00:00
Ehsan Kia 5c70075ca0 Merge branch 'master' of github.com:Jiiks/BetterDiscordApp into bttv-update-nov5
# Conflicts:
#	data/emotedata_ffz.json
2016-11-06 00:48:42 -07:00
Ehsan Kia dc48d88d59 Update BTTV emote db 2016-11-05 16:27:00 -07:00
Ehsan Kia 227547d7e7 Remove ImTriggered from FFZ 2016-11-05 16:24:35 -07:00
DeathStrikeV 00da2ef58c Updated emotes 2016-11-05 22:35:26 +00:00
DeathStrikeV 195e8a9b77 Updated emotes 2016-11-05 12:11:29 +00:00