Commit graph

863 commits

Author SHA1 Message Date
GregTCLTK
4d5b830a13
Language fix 2019-12-26 22:42:17 +01:00
Skidder
313c0c36c5
Merge pull request #255 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_86
Bump JDA from 4.1.0_84 to 4.1.0_86
2019-12-26 22:39:47 +01:00
GregTCLTK
8d26f6969c
Event Waiter 2019-12-26 22:34:14 +01:00
GregTCLTK
5ce89ae72e
Translation fix 2019-12-26 22:33:41 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
8d3001adcf
Edit Rules command #253 2019-12-26 21:46:13 +01:00
GregTCLTK
967985c80e
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-26 17:44:58 +01:00
GregTCLTK
a8d1dc1606
Begin with the Edit Rules Command 2019-12-26 17:44:52 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
GregTCLTK
0d621717df
EditRules Command 2019-12-26 17:43:40 +01:00
dependabot-preview[bot]
6ad176f789
Bump JDA from 4.1.0_84 to 4.1.0_86
Bumps JDA from 4.1.0_84 to 4.1.0_86.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-26 13:48:17 +00:00
GregTCLTK
dfa8578f8f
GH issue label 2019-12-26 14:18:29 +01:00
Skidder
827e5e16ad
Merge pull request #252 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_84
Bump JDA from 4.1.0_81 to 4.1.0_84
2019-12-25 15:24:55 +01:00
dependabot-preview[bot]
07ba3dabbc
Bump JDA from 4.1.0_81 to 4.1.0_84
Bumps JDA from 4.1.0_81 to 4.1.0_84.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-25 13:48:35 +00:00
GregTCLTK
1223e98552
Code improvements 2019-12-25 11:45:52 +01:00
Skidder
cb719f01ae
Merge pull request #250 from BigBotNetwork/master
Merged!
2019-12-25 00:56:02 +01:00
Skidder
6895e66cc0
Merge pull request #249 from BigBotNetwork/greg-dev
Custom error message
2019-12-25 00:54:34 +01:00
Skidder
1f17ff6ec3
Merge pull request #248 from BigBotNetwork/i18n
New Crowdin translations
2019-12-25 00:54:07 +01:00
Skidder
4b8901e99d New translations Translations_en.properties (German)
New German translation
2019-12-25 00:50:29 +01:00
GregTCLTK
c1fdacd46d
Custom error message for #245 2019-12-25 00:39:14 +01:00
Skidder
1c272f9066 New translations Translations_en.properties (English)
New English translation
2019-12-25 00:33:18 +01:00
Skidder
ec4ad872a1 New translations Translations_en.properties (English)
New English translation
2019-12-25 00:20:31 +01:00
Skidder
9e08cc4a0b New translations Translations_en.properties (English)
New English translation
2019-12-25 00:10:33 +01:00
Skidder
8061d72b1d New translations Translations_en.properties (German)
New German translation
2019-12-24 22:30:34 +01:00
Skidder
588e0bcea1 New translations Translations_en.properties (German)
New German translation
2019-12-24 22:20:38 +01:00
Skidder
ee118e3ee8 New translations Translations_en.properties (German)
New German translation
2019-12-24 22:10:34 +01:00
Skidder
6d81eddca1
Merge pull request #247 from BigBotNetwork/master
Merged!
2019-12-24 13:45:36 +01:00
Skidder
9b2591317f
Merge pull request #243 from BigBotNetwork/i18n
New Crowdin translations
2019-12-24 13:34:08 +01:00
Skidder
4f08e4f300 New translations Translations_en.properties (German)
New German translation
2019-12-24 13:33:56 +01:00
Skidder
29d16437af
Merge pull request #246 from BigBotNetwork/greg-dev
Merged!
2019-12-24 13:31:21 +01:00
GregTCLTK
8fdf2c42a8
Fix #245 2019-12-24 13:29:54 +01:00
Hax
1b33f84593
Merge branch 'master' into i18n 2019-12-23 19:31:50 +01:00
GregTCLTK
52c0ac730c
Skip command without skip 2019-12-23 18:07:40 +01:00
Skidder
e54918b832 New translations Translations_en.properties (German)
New German translation
2019-12-23 17:21:35 +01:00
Skidder
d02ded46b2 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-23 16:33:06 +01:00
Skidder
44bfa8449b New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-23 16:33:05 +01:00
Skidder
dddc0ffe22 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-23 16:33:03 +01:00
Skidder
fb6c090295 New translations Translations_en.properties (French)
New French translation
2019-12-23 16:33:01 +01:00
Skidder
9275f74558 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-23 16:33:00 +01:00
Skidder
e59f5fcc13 New translations Translations_en.properties (English)
New English translation
2019-12-23 16:32:58 +01:00
Skidder
4b36a903f1 New translations Translations_en.properties (German)
New German translation
2019-12-23 16:32:57 +01:00
Skidder
bfec1f497d
Merge pull request #244 from BigBotNetwork/greg-dev
Merged!
2019-12-23 16:22:52 +01:00
GregTCLTK
6c021cd07a
Info stuff 2019-12-23 16:10:49 +01:00
GregTCLTK
7489e6c79f
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-23 15:32:46 +01:00
GregTCLTK
ef74e3240b
Queue Command but queue is not working 2019-12-23 15:32:34 +01:00
Skidder
7eee000df0 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-23 14:31:51 +01:00
Skidder
8e075a7b13 New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-23 14:31:50 +01:00
Skidder
016cadfe24 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-23 14:31:49 +01:00
Skidder
c32ae83467 New translations Translations_en.properties (French)
New French translation
2019-12-23 14:31:47 +01:00
Skidder
8e2b702ed1 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-23 14:31:46 +01:00