Commit graph

425 commits

Author SHA1 Message Date
GregTCLTK
7738951911
AudioPlayerSendHandler leak^^ 2019-12-22 15:26:32 +01:00
GregTCLTK
a7c9578ee5
Music stuff yk 2019-12-22 14:46:21 +01:00
GregTCLTK
b1f82ae79d
Better Starboard 2019-12-22 12:24:48 +01:00
GregTCLTK
4f7f675a8a
Update 2019-12-22 11:12:01 +01:00
GregTCLTK
895d06d714
Screenshare is back 2019-12-22 09:57:40 +01:00
GregTCLTK
e051c81221
A new command? 🤔 2019-12-22 01:04:10 +01:00
GregTCLTK
77462097a8
Unused import 2019-12-21 20:25:31 +01:00
GregTCLTK
0e69b22ab1
Better code 2019-12-21 19:09:02 +01:00
GregTCLTK
fcaaa68daa
Removed unused imports 2019-12-21 18:43:23 +01:00
GregTCLTK
81dedc87d7
New permission system
!!!
2019-12-21 17:44:34 +01:00
GregTCLTK
c88a8849ff
Avatar Command fix 2019-12-21 16:33:45 +01:00
GregTCLTK
7a9c2172d8
Nothing special 2019-12-21 16:32:21 +01:00
Hax
29374518ff
Update MessageEditor.java 2019-12-21 15:02:59 +01:00
GregTCLTK
3215af2ac3
Move 2019-12-21 12:03:30 +01:00
GregTCLTK
04716fbc07
yk 2019-12-21 01:05:29 +01:00
GregTCLTK
d6e78b6a45
Prefix 2019-12-20 13:11:28 +01:00
GregTCLTK
5be162fd1a
Clyde i18n 2019-12-20 13:06:30 +01:00
GregTCLTK
08562562a5
Perms stuff yk 2019-12-19 21:10:15 +01:00
GregTCLTK
e7afeacce7
Top confidential Clyde command 2019-12-19 21:05:25 +01:00
GregTCLTK
860d035a63
Yeah Clyde Command 2019-12-19 19:30:51 +01:00
GregTCLTK
cc710b406d
^^ 2019-12-19 19:03:53 +01:00
GregTCLTK
871bd6b7c6
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-19 16:36:50 +01:00
Skidder
c494e3de8a
Merge pull request #225 from BigBotNetwork/hax-dev
Hax dev
2019-12-19 16:36:32 +01:00
Hax
747394ea82 Merge remote-tracking branch 'origin/hax-dev' into hax-dev 2019-12-18 20:22:02 +01:00
Hax
931e16c2da Fixed Perm error, Finished Starboard 2019-12-18 20:20:33 +01:00
GregTCLTK
3e1de81eb8
;) 2019-12-18 20:11:54 +01:00
GregTCLTK
7482c34b47
oof 2019-12-18 20:00:02 +01:00
GregTCLTK
774bb88797
Removed three unused imports 2019-12-18 19:23:10 +01:00
Skidder
2b2ee73f8c
Merge branch 'greg-dev' into hax-dev 2019-12-18 19:02:49 +01:00
Hax
ad6a6487c9 d 2019-12-18 18:55:26 +01:00
Hax
f32fc9b4bd Just some stuff 2019-12-18 18:50:48 +01:00
Skidder
4a190b73d7
Merge pull request #223 from BigBotNetwork/hax-dev
Introducing the Permission System
2019-12-18 18:21:45 +01:00
Hax
dde3848d37 Introducing the Permission System 2019-12-18 18:21:01 +01:00
GregTCLTK
ab6edbf20c
Guild Leave error msg 2019-12-18 18:17:18 +01:00
Skidder
dc91b47d20
Merge pull request #222 from BigBotNetwork/hax-dev
Hax dev
2019-12-18 18:06:02 +01:00
Hax
deb59caad2 what 2019-12-18 18:05:14 +01:00
GregTCLTK
ac92159078
starboard yk 2019-12-18 17:46:55 +01:00
GregTCLTK
12d8e33034
:^) 2019-12-18 17:24:37 +01:00
Hax
d3f96e874f Merge branch 'hax-dev' into greg-dev
# Conflicts:
#	src/main/java/com/bbn/hadder/Hadder.java
#	src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
#	src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
#	src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
#	src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
#	src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
#	src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
#	src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
#	src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
#	src/main/java/com/bbn/hadder/utils/MessageEditor.java
#	src/main/resources/Translations/Translations_en.properties
2019-12-18 17:15:28 +01:00
Hax
5ee5f31860 Bruh moment 2019-12-14 15:40:46 +01:00
GregTCLTK
f8e438d295
Clear All 2019-12-14 13:03:01 +01:00
GregTCLTK
fe3c0aee77
Rules Command fix 2019-12-14 12:06:46 +01:00
GregTCLTK
5009937fe2
Clear Command improvements 2019-12-14 11:55:14 +01:00
Hax
805ac1975e Added StarBoard 2019-12-13 20:20:01 +01:00
GregTCLTK
93e93f8f05
Translate Settings 2019-12-13 13:32:04 +01:00
GregTCLTK
200454e3fa
Owner Commands translation 2019-12-13 13:05:30 +01:00
Hax
41d9cf2d7a Merge branch 'hax-dev' 2019-12-12 21:48:28 +01:00
Hax
5979537371 Fixed the MentionListener 2019-12-12 21:47:32 +01:00
Hax
1ca08d300d Merge branch 'hax-dev' 2019-12-12 21:39:23 +01:00
Hax
0210cf7d0d Better Code 2019-12-12 21:37:32 +01:00