Merge Greg's branch into the master branch #297

Merged
greg6775 merged 14 commits from greg-dev into master 2020-01-03 15:37:09 +01:00

14 commits

Author SHA1 Message Date
GregTCLTK
ba7eb974da
#264 2020-01-03 15:35:51 +01:00
GregTCLTK
ec6c295947
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2020-01-03 15:25:53 +01:00
GregTCLTK
912dba9158
Custom error messages 2020-01-03 15:25:45 +01:00
Skidder
83f72a0cf9
Merge pull request #296 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_93
Bump JDA from 4.1.0_90 to 4.1.0_93
2020-01-03 14:50:51 +01:00
dependabot-preview[bot]
58a539a789
Bump JDA from 4.1.0_90 to 4.1.0_93
Bumps JDA from 4.1.0_90 to 4.1.0_93.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-03 13:50:40 +00:00
GregTCLTK
8cb9613fd6
New JSON String... 2020-01-02 22:42:28 +01:00
GregTCLTK
ad598590b6
New bot list 2020-01-02 22:41:04 +01:00
GregTCLTK
872320b304
Starboard help fix 2020-01-02 20:46:17 +01:00
GregTCLTK
cd899df118
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2020-01-02 20:39:44 +01:00
GregTCLTK
c0489f793e
Little spelling fix 2020-01-02 20:39:37 +01:00
Skidder
815c9bab79
Update README.md 2020-01-02 17:47:16 +01:00
Skidder
e5b6ddbf5e
Merge pull request #295 from BigBotNetwork/master
Merged!
2020-01-01 21:26:04 +01:00
GregTCLTK
a6bfb77584
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2020-01-01 21:25:19 +01:00
GregTCLTK
0d0b8affbc
Some code improvements again 2020-01-01 21:25:10 +01:00