Merge Greg's branch into the master branch #256

Merged
greg6775 merged 13 commits from greg-dev into master 2019-12-26 22:34:53 +01:00

13 commits

Author SHA1 Message Date
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
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