Commit graph

50 commits

Author SHA1 Message Date
Hax
054d967b70 Vom Bra muss der Benzer 2020-01-16 21:00:54 +01:00
Skidder
03c49ccd9f
Merge pull request #310 from BigBotNetwork/greg-dev
Merged!
2020-01-10 19:26:20 +01:00
Hax
db5bb91fa4 Merge remote-tracking branch 'origin/master' 2020-01-07 18:48:13 +01:00
GregTCLTK
93d5acda5d
Switch 2020-01-06 18:43:20 +01:00
GregTCLTK
fb0ef99d83
Integrate the loop function 2020-01-06 18:40:03 +01:00
GregTCLTK
c687cef65d
Error messages 2020-01-06 18:26:59 +01:00
GregTCLTK
305e17568f
Introducing loop command 2020-01-06 18:21:49 +01:00
GregTCLTK
3af62f2f25 Unpause feature 2020-01-05 01:36:26 +01:00
GregTCLTK
78dfaa6f7b Pause Command 2020-01-05 01:36:16 +01:00
GregTCLTK
e2ebdf20a9
#300 2020-01-04 14:42:09 +01:00
GregTCLTK
7a09a2b1bc
More error messages 2020-01-04 14:39:02 +01:00
GregTCLTK
ba46d948cc
Perm error msg 2020-01-04 13:58:55 +01:00
Hax
2b558c00fe Queue length 2020-01-03 18:23:06 +01:00
GregTCLTK
912dba9158
Custom error messages 2020-01-03 15:25:45 +01:00
GregTCLTK
5ef680e020
Translation fix 2020-01-01 13:35:08 +01:00
GregTCLTK
c50176085e
Volume command fixes 2020-01-01 13:32:44 +01:00
GregTCLTK
78b8a51a18
Warning -> Error 2019-12-31 13:49:35 +01:00
GregTCLTK
9e66fa1a3b
Volume command 2019-12-31 13:38:58 +01:00
GregTCLTK
2eff728c2f Error messages fix 2019-12-31 03:30:16 +01:00
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +01:00
GregTCLTK
50163ca1b0
Bug fixes and improvements 2019-12-28 15:22:03 +01:00
GregTCLTK
1eb970fca4
Skip and Stop Command 2019-12-28 15:11:24 +01:00
GregTCLTK
25b88c1005
Queue Command 2019-12-28 14:52:52 +01:00
GregTCLTK
8d19b9ae07
Info Command 2019-12-28 14:14:45 +01:00
GregTCLTK
bf5d3c8364
Unused imports 2019-12-28 13:50:52 +01:00
Hax
c3aaa9a238 Ez fix 2019-12-28 13:24:39 +01:00
GregTCLTK
6e73bcb554
fdsg 2019-12-28 13:12:10 +01:00
GregTCLTK
14387062bd Fix later 2019-12-28 02:48:32 +01:00
GregTCLTK
0e7c0b941f
Stop Command fix 2019-12-28 01:14:54 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
GregTCLTK
52c0ac730c
Skip command without skip 2019-12-23 18:07:40 +01:00
GregTCLTK
6c021cd07a
Info stuff 2019-12-23 16:10:49 +01:00
GregTCLTK
ef74e3240b
Queue Command but queue is not working 2019-12-23 15:32:34 +01:00
GregTCLTK
6ea63342af
Outsource yk 2019-12-22 20:48:11 +01:00
GregTCLTK
7bc151fc48
Removed unused imports 2019-12-22 20:30:36 +01:00
GregTCLTK
d462b0822d
Fix 2019-12-22 20:28:00 +01:00
GregTCLTK
4814cb00a0
Unused import fix 2019-12-22 16:50:06 +01:00
GregTCLTK
f373b5e969
Music pre-release!!! 2019-12-22 16:47:37 +01:00
GregTCLTK
895d06d714
Screenshare is back 2019-12-22 09:57:40 +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
b2f7347072
Music Command Translation 2019-12-12 20:46:57 +01:00
GregTCLTK
6bb0a77db6
Music part 1 2019-12-11 20:08:08 +01:00
GregTCLTK
8d61183657
Join Command Fix 2019-12-10 16:40:33 +01:00
GregTCLTK
27443316be
Join Command more error messages 2019-12-07 20:00:27 +01:00
GregTCLTK
133ef8791c
I would call it "better code" 2019-11-30 12:42:50 +01:00
GregTCLTK
7455dd2162
Error Fix 2019-11-29 18:01:18 +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