master -> greg dev #93

Merged
greg6775 merged 16 commits from master into greg-dev 2019-11-22 23:41:43 +01:00

16 commits

Author SHA1 Message Date
Skidder
99cf3a44f5
Update RulesListener.java 2019-11-22 14:36:18 -08:00
Hax
41a3b2afd0
Merge pull request #91 from BigBotNetwork/hax-dev
Hax dev
2019-11-22 22:24:55 +01:00
Skidder
3dc1306106
Merge pull request #92 from BigBotNetwork/greg-dev
Greg dev
2019-11-22 22:24:04 +01:00
Hax
fed24d2a7f
Merge branch 'master' into hax-dev 2019-11-22 22:23:43 +01:00
Hax
d1b2483d0f Added Help when args are missing or are false 2019-11-22 22:21:43 +01:00
Hax
b2a47da482 Added LinkCommand, Added multithreading 2019-11-22 21:47:13 +01:00
Skidder
2b69aff056
Merge pull request #90 from BigBotNetwork/greg-dev
Greg dev
2019-11-22 15:36:34 +01:00
Skidder
8b366f7f78
Merge pull request #88 from BigBotNetwork/greg-dev
Feedback Command
2019-11-22 15:18:46 +01:00
Skidder
f58b4e596c
Merge pull request #82 from BigBotNetwork/greg-dev
Discord Bot Reviews
2019-11-21 20:31:27 +01:00
Skidder
585113af3f
Merge pull request #81 from BigBotNetwork/greg-dev
Greg dev
2019-11-21 18:29:34 +01:00
Skidder
414ddcce09
Merge pull request #77 from BigBotNetwork/dependabot/maven/net.dv8tion-JDA-4.0.0_62
Bump JDA from 4.0.0_61 to 4.0.0_62
2019-11-21 15:46:22 +01:00
Skidder
8da29fb176
Merge pull request #79 from BigBotNetwork/greg-dev
Greg dev
2019-11-20 20:56:20 +01:00
dependabot-preview[bot]
984fb4e657
Bump JDA from 4.0.0_61 to 4.0.0_62
Bumps JDA from 4.0.0_61 to 4.0.0_62.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 13:21:52 +00:00
Skidder
24e547c7f1
Merge pull request #76 from BigBotNetwork/greg-dev
User Count
2019-11-18 14:02:31 +01:00
Skidder
56031f2ffe
Merge pull request #75 from BigBotNetwork/greg-dev
9 very nice Commands 😏
2019-11-17 15:58:57 +01:00
Skidder
8ad76ef768
Merge pull request #74 from BigBotNetwork/greg-dev
Greg dev
2019-11-17 01:33:21 +01:00