Commit graph

411 commits

Author SHA1 Message Date
GregTCLTK
07ebfe121a
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-22 14:42:18 -08:00
Skidder
b7da6f293e
Merge pull request #93 from BigBotNetwork/master
master -> greg dev
2019-11-22 23:41:42 +01:00
Skidder
99cf3a44f5
Update RulesListener.java 2019-11-22 14:36:18 -08:00
GregTCLTK
1cbd2e0af9
Rules Fix 2019-11-22 14:34:16 -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
GregTCLTK
d81afdd4df
Rules Decline -> kick 2019-11-22 13:16:08 -08:00
GregTCLTK
68303f1d9e
Role remove Command but it's buggy 2019-11-22 13:11:34 -08: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
GregTCLTK
66657623b3
OOOFFFFFF 2019-11-22 06:35:27 -08:00
GregTCLTK
1e7560b1b4
Feedback label 2019-11-22 06:24:44 -08:00
Skidder
8b366f7f78
Merge pull request #88 from BigBotNetwork/greg-dev
Feedback Command
2019-11-22 15:18:46 +01:00
GregTCLTK
cc15d43036
Feedback Command 2019-11-22 06:14:34 -08:00
GregTCLTK
71930bef17
Channel must be on the same guild 2019-11-22 05:55:36 -08:00
GregTCLTK
fe6b8c4887
GitHub API and Config 2019-11-22 05:39:21 -08:00
GregTCLTK
834b23832e
Introducing Feedback Command :D 2019-11-22 04:23:34 -08:00
Skidder
f58b4e596c
Merge pull request #82 from BigBotNetwork/greg-dev
Discord Bot Reviews
2019-11-21 20:31:27 +01:00
GregTCLTK
f59d66a65f
Discord Bot Reviews 2019-11-21 11:29:47 -08:00
Skidder
585113af3f
Merge pull request #81 from BigBotNetwork/greg-dev
Greg dev
2019-11-21 18:29:34 +01:00
GregTCLTK
971f6f422d
Better code 2019-11-21 09:24:54 -08:00
GregTCLTK
14360eb512
Fix sth. 2019-11-21 07:39:44 -08: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
GregTCLTK
471aaa887d
Fix 2019-11-20 12:05:41 -08:00
GregTCLTK
cc3eee1945
LATEST is deprecated my friends 2019-11-20 12:05:36 -08:00
Skidder
8da29fb176
Merge pull request #79 from BigBotNetwork/greg-dev
Greg dev
2019-11-20 20:56:20 +01:00
GregTCLTK
4550179994
Very very bad Rules Command. I'll fix this later 2019-11-20 11:55:31 -08:00
GregTCLTK
450253106c
Perms check 2019-11-20 10:16:23 -08:00
GregTCLTK
0a04c8185f
Rules Command 1/? 2019-11-20 09:58:27 -08:00
GregTCLTK
a72ed14cc5
Remove 2019-11-20 07:52:05 -08:00
Skidder
7da36b55bb
Merge pull request #78 from BigBotNetwork/hax-dev
Hax dev
2019-11-20 16:22:31 +01:00
Hax
c680b6a903 It's rewind time everybody 2019-11-20 15:25:19 +01:00
Hax
664c2b9db0 wtf, please fix this tomorrow 2019-11-19 23:50:13 +01:00
Hax
320c2e98db Merge remote-tracking branch 'origin/greg-dev' into hax-dev 2019-11-19 21:31:45 +01:00
GregTCLTK
bc151bbbb7
Annoying 2019-11-18 14:50:53 +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
GregTCLTK
28a06aa337
User Count 2019-11-18 14:01:59 +01:00
Skidder
56031f2ffe
Merge pull request #75 from BigBotNetwork/greg-dev
9 very nice Commands 😏
2019-11-17 15:58:57 +01:00
GregTCLTK
5b80a9f24b
9 very nice Commands 😏 2019-11-17 15:58:16 +01:00
Skidder
8ad76ef768
Merge pull request #74 from BigBotNetwork/greg-dev
Greg dev
2019-11-17 01:33:21 +01:00
GregTCLTK
c95b8d6c54
Very nice improvements 2019-11-17 01:32:33 +01:00
GregTCLTK
7cf1e8769f
Check perms 2019-11-17 00:36:56 +01:00
GregTCLTK
a5907ef139
AddRole to Role 2019-11-17 00:11:01 +01:00
Skidder
68dff73f2c
Merge pull request #73 from BigBotNetwork/hax-dev
AddRoleCommand
2019-11-16 23:57:45 +01:00
Hax
1f254cf7d3 Merge remote-tracking branch 'origin/master' into hax-dev 2019-11-16 23:56:23 +01:00
Skidder
0a2c51aac2
Merge pull request #72 from BigBotNetwork/greg-dev
Greg dev
2019-11-16 22:55:56 +01:00
GregTCLTK
16c948781a
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-16 22:54:29 +01:00