Greg dev #140

Merged
greg6775 merged 102 commits from greg-dev into hax-dev 2019-12-03 06:57:07 +01:00

102 commits

Author SHA1 Message Date
GregTCLTK
9125d1b6d5
Triggers timeout 2019-12-02 20:58:54 +01:00
GregTCLTK
f838793e19
Rules Command improvement 2019-12-02 19:31:15 +01:00
GregTCLTK
f41dd11d3e
Combine one if else statement 2019-12-02 18:51:05 +01:00
GregTCLTK
e7e55e44ba
Rules Command feature 2019-12-02 18:38:43 +01:00
GregTCLTK
03b5c332a5
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-02 18:14:41 +01:00
GregTCLTK
9d028e629c
Fix 2019-12-02 18:14:35 +01:00
Skidder
803e5e4ee7
Merge pull request #133 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_69
Bump JDA from 4.0.0_67 to 4.0.0_69
2019-12-02 06:38:17 -08:00
Skidder
d3f3971b0f
Merge pull request #132 from BigBotNetwork/dependabot/maven/greg-dev/com.sedmelluq-lavaplayer-1.3.32
Bump lavaplayer from 1.3.29 to 1.3.32
2019-12-02 06:38:03 -08:00
dependabot-preview[bot]
f63162ffc3
Bump JDA from 4.0.0_67 to 4.0.0_69
Bumps JDA from 4.0.0_67 to 4.0.0_69.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 13:21:57 +00:00
dependabot-preview[bot]
281598f565
Bump lavaplayer from 1.3.29 to 1.3.32
Bumps lavaplayer from 1.3.29 to 1.3.32.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 13:21:31 +00:00
GregTCLTK
d9bb7a60a8
MessageUpdateListener Fix 2019-12-02 14:04:50 +01:00
GregTCLTK
2e8a8fb102
Last code improvements :D 2019-12-02 09:15:26 +01:00
GregTCLTK
8bea23f41b
4 more improvements 2019-12-02 09:11:15 +01:00
GregTCLTK
67faa70aaf
More code improvements 2019-12-02 08:56:36 +01:00
GregTCLTK
d53068dd50
Code improvements 2019-12-02 08:47:48 +01:00
GregTCLTK
79c6e5ddee
Eval Command fix 2019-12-02 08:43:48 +01:00
GregTCLTK
40e4215d60
Invite Link Detector 2019-12-02 08:28:20 +01:00
GregTCLTK
fd2258a6fb
GuildPrefix Message Fix 2019-12-02 08:02:08 +01:00
GregTCLTK
7c2daa3b42
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-01 10:02:18 +01:00
GregTCLTK
6cb0ab4c4b
Remove ":" 2019-12-01 10:02:12 +01:00
Skidder
2f63bb085f
Merge pull request #118 from BigBotNetwork/master
ISSUE_TEMPLATE
2019-12-01 00:56:24 -08:00
Skidder
27a9b56b56
Merge pull request #117 from BigBotNetwork/greg-dev
New BotList
2019-12-01 00:55:55 -08:00
GregTCLTK
d414539814
Add BotList.Space 2019-12-01 09:53:22 +01:00
GregTCLTK
2ada69c8f1
New Widget 2019-12-01 09:44:19 +01:00
GregTCLTK
eac328ea6b
setAutoReconnect 2019-11-30 20:21:11 +01:00
GregTCLTK
91047e5b05
Codacy Badge 2019-11-30 14:39:51 +01:00
GregTCLTK
459fa9cffd
Remove Unused Imports 2019-11-30 14:37:52 +01:00
Skidder
87de7ab82d
Merge pull request #115 from BigBotNetwork/greg-dev
Greg dev
2019-11-30 03:53:11 -08:00
GregTCLTK
7abbe28325
PrivateMessageListener fix 2019-11-30 12:52:36 +01:00
GregTCLTK
7f44c2358b
SelfMentionListener fix 2019-11-30 12:50:48 +01:00
Skidder
3f19117e60
Merge pull request #114 from BigBotNetwork/greg-dev
Easier MessageEditor and more Eval stuff
2019-11-30 03:44:51 -08:00
GregTCLTK
133ef8791c
I would call it "better code" 2019-11-30 12:42:50 +01:00
GregTCLTK
a9ab1acdbc
More Eval stuff 2019-11-29 20:47:17 +01:00
Hax
79abf99b15
Update README.md 2019-11-29 20:30:35 +01:00
Skidder
b4e54c4b30 Update issue templates 2019-11-29 18:13:29 +01:00
Skidder
f6e3869862
Merge pull request #112 from BigBotNetwork/greg-dev
Greg dev
2019-11-29 09:05:13 -08:00
Skidder
1e936c5c66
Merge branch 'master' into greg-dev 2019-11-29 09:05:05 -08:00
Skidder
902592d35b
Merge pull request #111 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_67
Bump JDA from 4.0.0_66 to 4.0.0_67
2019-11-29 09:02:37 -08:00
GregTCLTK
ab6df76002
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-29 18:01:28 +01:00
GregTCLTK
7455dd2162
Error Fix 2019-11-29 18:01:18 +01:00
dependabot-preview[bot]
b077f4f5d8
Bump JDA from 4.0.0_66 to 4.0.0_67
Bumps JDA from 4.0.0_66 to 4.0.0_67.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-29 13:49:02 +00:00
Skidder
ee21beb470
Merge pull request #110 from BigBotNetwork/dependabot/maven/greg-dev/org.kohsuke-github-api-1.101
Bump github-api from 1.100 to 1.101
2019-11-28 07:45:57 -08:00
dependabot-preview[bot]
dc6cecb91d
Bump github-api from 1.100 to 1.101
Bumps github-api from 1.100 to 1.101.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-28 13:49:17 +00:00
GregTCLTK
ca2c714297
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-27 18:37:24 +01:00
GregTCLTK
de1546277c
A real config file 2019-11-27 18:36:57 +01:00
Skidder
175977fbd6
Merge pull request #108 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_66
Bump JDA from 4.0.0_62 to 4.0.0_66
2019-11-27 07:13:48 -08:00
Skidder
5d3e5951d7
Merge pull request #109 from BigBotNetwork/dependabot/maven/greg-dev/com.sedmelluq-lavaplayer-1.3.29
Bump lavaplayer from 1.3.27 to 1.3.29
2019-11-27 07:13:38 -08:00
Skidder
e3db7256c1
Merge pull request #107 from BigBotNetwork/dependabot/maven/greg-dev/org.kohsuke-github-api-1.100
Bump github-api from 1.99 to 1.100
2019-11-27 07:13:25 -08:00
dependabot-preview[bot]
2cd4e00d03
Bump lavaplayer from 1.3.27 to 1.3.29
Bumps lavaplayer from 1.3.27 to 1.3.29.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 13:43:58 +00:00
dependabot-preview[bot]
c15c720ea0
Bump JDA from 4.0.0_62 to 4.0.0_66
Bumps JDA from 4.0.0_62 to 4.0.0_66.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 13:43:28 +00:00
dependabot-preview[bot]
eb83989d45
Bump github-api from 1.99 to 1.100
Bumps github-api from 1.99 to 1.100.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 13:43:04 +00:00
Skidder
6984922530
Merge pull request #105 from BigBotNetwork/dependabot/maven/net.dv8tion-JDA-4.0.0_64
Bump JDA from 4.0.0_62 to 4.0.0_64
2019-11-26 13:01:12 -08:00
Skidder
ff2bc8f513
Merge pull request #106 from BigBotNetwork/dependabot/maven/com.sedmelluq-lavaplayer-1.3.29
Bump lavaplayer from 1.3.27 to 1.3.29
2019-11-26 13:01:03 -08:00
dependabot-preview[bot]
fd8eee3041
Bump lavaplayer from 1.3.27 to 1.3.29
Bumps lavaplayer from 1.3.27 to 1.3.29.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-26 13:45:34 +00:00
dependabot-preview[bot]
db8d410aab
Bump JDA from 4.0.0_62 to 4.0.0_64
Bumps JDA from 4.0.0_62 to 4.0.0_64.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-26 13:45:01 +00:00
GregTCLTK
4a87debe09
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-25 20:43:24 +01:00
GregTCLTK
b07ce74bad
Some nice stuff 2019-11-25 20:43:17 +01:00
Skidder
de5df83866
Create .gitattributes 2019-11-25 19:06:43 +01:00
Skidder
01c7357dcc
Merge pull request #104 from BigBotNetwork/greg-dev
pls work
2019-11-25 06:39:31 -08:00
GregTCLTK
e07a821302
This should work 🤔 2019-11-25 14:14:46 +01:00
Skidder
71c7c99a08
Merge pull request #102 from BigBotNetwork/master
remove
2019-11-25 05:10:23 -08:00
Skidder
f0b0491afc
B 2019-11-25 12:22:57 +01:00
Skidder
68f96a9508
Merge pull request #101 from BigBotNetwork/greg-dev
f
2019-11-25 00:24:01 -08:00
GregTCLTK
0ef3b96ae3
f 2019-11-25 09:23:23 +01:00
Skidder
3325d08da3
Merge pull request #100 from BigBotNetwork/greg-dev
Greg dev
2019-11-24 23:55:36 -08:00
GregTCLTK
f5450e59aa
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-11-25 08:54:10 +01:00
GregTCLTK
137aeddbdb
New Bot List :) 2019-11-25 08:53:48 +01:00
Skidder
120f713b8a
Update README.md 2019-11-25 08:43:42 +01:00
Skidder
156ef71fe5
Merge pull request #99 from BigBotNetwork/greg-dev
Args fix
2019-11-24 12:31:50 -08:00
GregTCLTK
e602cd4283
Args fix 2019-11-24 21:31:17 +01:00
Skidder
07c26845ec
Merge pull request #98 from BigBotNetwork/greg-dev
Greg dev
2019-11-24 11:03:23 -08:00
GregTCLTK
a8b73c6b4a
Very important! 2019-11-24 20:03:00 +01:00
GregTCLTK
2466606b65
^^
^^
2019-11-24 19:55:10 +01:00
GregTCLTK
922bc357a4
Again a fix for the Rules Command 2019-11-24 19:50:26 +01:00
GregTCLTK
a53c049059
Leave and GuildLeave 2019-11-24 18:27:59 +01:00
GregTCLTK
9bc4d897a5
Music Bot 😏 2019-11-24 17:17:07 +01:00
GregTCLTK
c016d1246d
Very nice fix 2019-11-24 15:19:44 +01:00
Skidder
64af3c28d0
Merge pull request #97 from BigBotNetwork/greg-dev
Greg dev
2019-11-24 05:25:30 -08:00
GregTCLTK
b81d4821fa
sdf 2019-11-24 14:25:15 +01:00
GregTCLTK
f4118f2958
fck 2019-11-24 14:24:57 +01:00
GregTCLTK
5eb0489d54
Not needed 2019-11-23 05:42:18 -08:00
Skidder
a0af1a9e37
Merge pull request #96 from BigBotNetwork/greg-dev
Greg dev
2019-11-23 04:16:03 -08:00
GregTCLTK
c0d25b7ae1
Rules MESSAGE_WRITE check 2019-11-23 03:49:53 -08:00
GregTCLTK
aedf64d295
Eval Command 2019-11-23 03:21:41 -08:00
GregTCLTK
53ef9fb1ff
Introducing Eval Command 2019-11-23 03:08:33 -08:00
GregTCLTK
399aade130
Better code 2019-11-23 02:54:07 -08:00
Skidder
f51f470e69
Merge pull request #95 from BigBotNetwork/greg-dev
Avatar Command
2019-11-22 18:28:02 -08:00
GregTCLTK
df8e0dc752
Avatar Command 2019-11-22 16:30:57 -08:00
GregTCLTK
ef1b1e1d24
Some owner stuff 2019-11-22 16:06:05 -08:00
GregTCLTK
5a849dfbde
😬 2019-11-22 15:34:55 -08:00
Skidder
9ab794d768
Merge pull request #94 from BigBotNetwork/greg-dev
Greg dev
2019-11-23 00:32:49 +01:00
GregTCLTK
f6e8b98422
Rules Command improvements 2019-11-22 15:22:13 -08:00
GregTCLTK
434cc3e8df
Rules Command 2019-11-22 15:08:21 -08:00
GregTCLTK
485747963e
Rules Decline --> kick 2019-11-22 14:52:27 -08:00
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
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