Commit Graph

635 Commits

Author SHA1 Message Date
DeathStrikeV f2d4680698 Updated emotes 2017-01-02 22:12:25 +00:00
Zerthox b4bc6ff109 Add Dirk 2016-12-31 20:24:44 +01:00
DeathStrikeV e21c1dc28a Updated emotes 2016-12-31 10:54:51 +00:00
DeathStrikeV bebf352bd0 Updated emotes 2016-12-29 23:29:16 +00:00
DeathStrikeV 1111b98767 Updated emotes 2016-12-24 11:09:20 +00:00
DeathStrikeV ffb456c466 Updated emotes 2016-12-22 23:21:20 +00:00
DeathStrikeV 68247caf66 Updated emotes 2016-12-20 07:38:43 +00:00
Zerthox c65b760ca1 Add Spooky, Spaghetti, Rucksack, Rein 2016-12-19 19:18:31 +01:00
DeathStrikeV 8e4b5f6ee0 Updated emotes 2016-12-17 22:10:30 +00:00
DeathStrikeV 6e08a4b1ed Updated emotes 2016-12-17 12:26:26 +00:00
DeathStrikeV 0b26620901 Updated emotes 2016-12-17 08:23:40 +00:00
DeathStrikeV d4c8f04331 Merge pull request #9 from Jiiks/master
Update to latest
2016-12-17 07:23:23 +00:00
DeathStrikeV 67f0257cb4 Updated emotes 2016-12-17 07:20:25 +00:00
pohky a2de68ec1f Update emotefilter.json
Added Bella
2016-12-16 23:22:19 +01:00
DeathStrikeV 93115073e9 Updated emotes 2016-12-13 23:11:30 +00:00
DeathStrikeV 19f5f9f7a5 Updated emotes 2016-12-13 08:27:48 +00:00
Jiiks 131eab393d Merge pull request #418 from Zerthox/patch-3
Added Meow, Hartz, Brille, Affe, Baby, YOUTUBE to emote filter
2016-12-12 22:44:18 +02:00
DeathStrikeV 42898de340 Updated emotes 2016-12-12 20:33:40 +00: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
DeathStrikeV d2a7c6734a Updated emotes 2016-12-10 07:39:51 +00: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
DeathStrikeV df2b647750 Updated emotes 2016-12-08 05:01:16 +00:00
DeathStrikeV 4e0a23ec03 Updated emotes 2016-12-07 01:39:00 +00:00
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
Zerthox c0bd71fe7d Added Meow & Hartz 2016-11-21 19:57:26 +01: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
DeathStrikeV 7cb778f884 Updated emotes 2016-11-05 01:56:58 +00:00
DeathStrikeV 289abee257 Updated emotes 2016-11-05 00:07:28 +00:00
DeathStrikeV 07968430e3 Updated emotes 2016-11-04 22:43:27 +00:00
DeathStrikeV e1470dab3e Updated emotes 2016-11-04 00:06:53 +00:00
DeathStrikeV ab0e948fe4 Updated emotes 2016-11-03 20:43:07 +00:00
Alex 66c24f246a Merge pull request #3 from Jiiks/master
Updating to latest
2016-11-02 21:28:33 +00:00
DeathStrikeV 27b1978515 Updated emotes 2016-11-02 21:22:04 +00:00
Jiiks c3443b5725 added Okie 2016-11-02 07:38:03 +02:00
DeathStrikeV 5e466e79fd Updated emotes 2016-11-01 08:07:46 +00:00
Jiiks 4f549676bc Merge pull request #392 from DeathStrikeV/master
FFZ Emote Update
2016-11-01 05:50:31 +02:00
DeathStrikeV 3d381b7ca1 Updated emotes 2016-10-30 21:56:27 +00:00
DeathStrikeV 469cb2a2da Updated emotes 2016-10-29 21:09:50 +01:00
DeathStrikeV 8b57885002 Updated emotes 2016-10-29 00:36:56 +01:00
DeathStrikeV 3429d6c8ca Updated emotes 2016-10-28 07:58:50 +01:00
DeathStrikeV a80d16fbd8 Updated emotes 2016-10-20 08:07:38 +01:00
Ehsan Kia 2db776f93a Updated BTTV emote database 2016-10-16 19:01:11 -07:00
DeathStrikeV e330ff197d Updated emotes 2016-10-16 19:52:23 +01:00
DeathStrikeV b002ae6130 Updated emotes 2016-10-11 09:41:09 +01:00
DeathStrikeV 5c27d91fde Updated emotes 2016-10-09 22:02:09 +01:00
DeathStrikeV 5f94a8b155 Updated emotes 2016-10-08 17:13:27 +01:00
DeathStrikeV f18f353501 Updated emotes 2016-10-08 16:33:12 +01:00
DeathStrikeV 0e2bf5b1c4 Updated emotes 2016-10-07 20:05:05 +01:00
DeathStrikeV ea34f260df Updated emotes 2016-10-07 20:02:43 +01:00
DeathStrikeV 56f590dbf4 Updated emotes 2016-10-07 19:37:07 +01:00
DeathStrikeV 54709b608a Updated emotes 2016-10-07 10:58:51 +01:00
DeathStrikeV aaea907eac Updated emotes 2016-10-06 23:01:55 +01:00
DeathStrikeV ebb99040e4 Updated emotes 2016-10-06 22:43:01 +01:00
DeathStrikeV d874f6becc Updated emotes 2016-10-06 20:09:35 +01:00
DeathStrikeV f3d8865df5 Updated emotes 2016-10-06 00:36:17 +01:00
DeathStrikeV 9098bca396 Updated emotes 2016-10-05 19:42:21 +01:00
DeathStrikeV e7bda2e6c1 Updated ffz emotes 2016-10-02 21:16:52 +01:00
Ehsan Kia ad2f98107a Add new bttv emotes 2016-09-21 00:47:21 -07:00
Ehsan Kia 39505125fd Added new bttv emotes 2016-09-05 15:44:04 -07:00
Jiiks 48d4a58102 ayy and indent 2016-08-16 12:24:55 +03:00
Ehsan Kia 51ae2698c4 Adding new BTTV emotes 2016-08-15 21:55:01 -04: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 d377cef33c FFZ Emotes Update 2016-08-02 14:44:31 +02:00
Ehsan Kia 320a68f8cb Fix stupid javascript issue 2016-08-01 15:34:01 -04:00
Ehsan Kia 4b63daaf48 BTTV database update 2016-08-01 15:16:30 -04: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
Ehsan Kia 6d1b7667b8 BTTV database update july 24 2016-07-24 16:13:23 -04: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
pohky 8c2e38662c Update emotefilter.json 2016-07-20 21:14:37 +02:00
pohky 31617f79b3 FFZ Emotes Update 2016-07-20 15:22:20 +02:00
Ehsan Kia 1a394c75c9 updated bttv db emote 2016-07-18 20:09:22 -04:00
pohky b604daf201 Update emotefilter.json 2016-07-16 10:54:10 +02:00
pohky 2eb0f8d9c7 Update emotefilter.json 2016-07-13 07:37:37 +02:00
pohky 839c06d968 Update emotefilter.json 2016-07-12 12:26:09 +02:00
Ehsan Kia f2d76b2e99 Fix missing emotes 2016-07-11 10:43:42 -04:00
pohky 4d63434d51 Update emotefilter.json 2016-07-10 03:02:48 +02:00
Ehsan Kia ba4402a4d4 New BTTV emote db update 2016-07-09 09:50:50 -04:00
pohky d36caf0599 Update emotefilter.json 2016-07-08 11:03:03 +02:00
pohky 40dbd67e80 Update emotefilter.json 2016-07-07 23:12:33 +02:00
pohky 19393f4480 Update emotefilter.json 2016-07-06 18:48:15 +02:00
pohky 9bf4b9dcb6 Update emotefilter.json 2016-07-05 23:05:49 +02:00
pohky c07f7ac73f Update FFZ emotes 2016-07-05 23:03:16 +02:00
pohky 3ba91bfbf3 Update emotefilter.json 2016-07-02 18:11:12 +02:00
pohky 1a48e6045f Update emotefilter.json 2016-06-30 04:04:35 +02:00
Jiiks 3c62a57b96 Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp 2016-06-29 12:30:31 +03:00
Jiiks 1a560a1656 added "Freddie" 2016-06-29 12:30:27 +03:00
Jiiks d2c5a95f13 Merge pull request #339 from EhsanKia/bttv-update-june26
Update BTTV db
2016-06-27 23:50:46 +03:00
pohky 6998c5c131 Update emotefilter.json 2016-06-27 11:41:37 +02:00
pohky 01070c916c Update emotefilter.json 2016-06-27 01:46:01 +02:00
Ehsan Kia 136266be85 Update BTTV db 2016-06-26 16:45:59 -04:00
pohky 995868b5b9 FFZ Emotes update 2016-06-21 04:01:47 +02:00
pohky d8457795e4 Update emotefilter.json 2016-06-20 11:44:24 +02:00
Ehsan Kia d8db32f389 Updated BTTV emote database 2016-06-19 17:33:25 -04:00
pohky 22513f3d27 Update FFZ emotes 2016-06-13 04:02:36 +02:00
Ehsan Kia f978d4b2d9 Updated BTTV emote database 2016-06-12 00:26:27 -04:00
Ehsan Kia 4e20898cae Update BTTV emote database 2016-06-06 09:13:44 -04:00
pohky 1dfd428995 FFZ Emotes Update 2016-06-05 10:27:27 +02:00
pohky 46f983f132 Update emotefilter.json 2016-06-03 04:35:16 +02:00
pohky f535aa5761 Update emotefilter.json 2016-06-02 19:46:09 +02:00
pohky ab07e14d7f Update emotefilter.json 2016-06-01 03:13:11 +02:00
pohky bdbc2c0110 Update emotefilter.json 2016-05-31 04:55:45 +02:00
pohky 00e64da94a Update emotefilter.json 2016-05-31 01:00:21 +02:00
pohky 0370e80071 Update FFZ Emotes 2016-05-30 21:35:51 +02:00
Ehsan Kia e6955f919d Update BTTV emote DB 2016-05-26 01:12:24 -04:00
pohky b55607f1b2 Update emotefilter.json 2016-05-25 08:25:14 +02:00
pohky 3451215be9 Update emotefilter.json 2016-05-25 00:17:27 +02:00
pohky 8a786de8cc Update emotefilter.json 2016-05-24 17:07:28 +02:00
pohky 1137428be4 Update emotefilter.json 2016-05-22 16:55:03 +02:00
pohky d09d870d9e FFZ Emotes update 2016-05-22 07:17:14 +02:00
pohky e9461a9830 Update emotefilter.json 2016-05-19 15:44:48 +02:00
Jiiks 178f2b464c Added Choco 2016-05-18 03:43:21 +03:00
Ehsan Kia c7fa09505d Updated BTTV emote database 2016-05-15 00:45:28 -04:00
pohky d6c55d7e1b Update emotefilter.json 2016-05-15 01:58:02 +02:00
pohky 276b39e169 Update emotedata_ffz.json, emotefilter.json
weekly update
2016-05-15 01:19:22 +02:00
pohky 9c6b3629d3 Update emotefilter.json 2016-05-13 09:14:22 +02:00
pohky 5a636f6e9a Update emotefilter.json 2016-05-12 23:39:55 +02:00
pohky 66d7636228 Update emotefilter.json 2016-05-12 14:56:03 +02:00
pohky 201d1fb22b Update emotefilter.json 2016-05-11 22:59:18 +02:00
pohky cb7176be5d Update emotefilter.json 2016-05-11 02:20:00 +02:00
pohky c3dff1ca6e Update emotefilter.json 2016-05-11 00:54:06 +02:00
pohky 6be4da2197 Update emotedata_ffz.json, emotefilter.json 2016-05-09 11:30:45 +02:00
pohky 5add6c9a21 Update emotefilter.json 2016-05-08 02:55:15 +02:00
Ehsan Kia 5c3f653718 Updated BTTV emote database 2016-05-07 13:45:20 -04:00
pohky 6b8f324199 Update emotefilter.json 2016-05-07 19:21:16 +02:00
pohky c86be946ee Update emotefilter.json 2016-05-07 00:17:08 +02:00
pohky 9b4f2bac09 Update emotefilter.json 2016-05-06 21:52:53 +02:00
pohky 888bebbfb0 Update emotefilter.json 2016-05-06 12:59:12 +02:00
pohky be5f2cf70d Update emotedata_ffz 2016-05-06 11:28:35 +02:00
pohky 7087d174fa Update emotefilter.json 2016-05-06 11:27:34 +02:00
pohky 62684b80e7 Update emotefilter.json 2016-05-04 03:47:03 +02:00
pohky 725b0ce80e Update emotefilter.json 2016-05-03 18:38:20 +02:00
pohky b7a2cd30f9 Update emotefilter.json 2016-05-02 14:17:16 +02:00
pohky 30e2700fa6 Update emotefilter.json 2016-05-02 05:19:03 +02:00
pohky fb500bcfb5 Update emotefilter.json 2016-05-02 00:27:39 +02:00
pohky 18c11def46 Update emotefilter.json 2016-05-01 16:49:56 +02:00
pohky cb63744be6 Update emotefilter.json 2016-05-01 15:22:39 +02:00
pohky f0b3fb07b0 Update emotefilter.json 2016-05-01 15:18:20 +02:00
pohky 2306ce740f Update emotefilter.json 2016-05-01 08:06:41 +02:00
Ehsan Kia a084e422d0 updated bttv database 2016-04-30 19:30:49 -04:00