Merge Greg's branch into the master branch #282

Merged
greg6775 merged 12 commits from greg-dev into master 2019-12-30 19:30:32 +01:00

12 commits

Author SHA1 Message Date
GregTCLTK
ff64355163
A new help command :) 2019-12-30 19:30:18 +01:00
GregTCLTK
19f7bc920d
Help command improvements 2019-12-30 19:27:28 +01:00
GregTCLTK
bf5f86f022
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-30 19:00:50 +01:00
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +01:00
Skidder
ed5d625d7d
Merge pull request #278 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_88
Bump JDA from 4.1.0_87 to 4.1.0_88
2019-12-30 14:21:24 +01:00
dependabot-preview[bot]
14abfb442b
Bump JDA from 4.1.0_87 to 4.1.0_88
Bumps JDA from 4.1.0_87 to 4.1.0_88.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 13:21:13 +00:00
GregTCLTK
9d0f60fe56
Didn't work lul 2019-12-30 13:50:01 +01:00
GregTCLTK
5059e7b165 Continue later 2019-12-30 03:47:01 +01:00
GregTCLTK
29dd178715 CONTINUE WORK LATER!!! 2019-12-30 03:46:43 +01:00
GregTCLTK
4dd6b05bd0
I think it was duplicated 2019-12-30 00:06:01 +01:00
GregTCLTK
3311bcd428
Remove unused import 2019-12-30 00:03:00 +01:00
GregTCLTK
aa435eac9a
Codacy issue fix 2019-12-28 21:53:27 +01:00