Commit graph

33 commits

Author SHA1 Message Date
GregTCLTK
5ce89ae72e
Translation fix 2019-12-26 22:33:41 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
8d3001adcf
Edit Rules command #253 2019-12-26 21:46:13 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
GregTCLTK
c1fdacd46d
Custom error message for #245 2019-12-25 00:39:14 +01:00
GregTCLTK
8fdf2c42a8
Fix #245 2019-12-24 13:29:54 +01:00
GregTCLTK
81dedc87d7
New permission system
!!!
2019-12-21 17:44:34 +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
fe3c0aee77
Rules Command fix 2019-12-14 12:06:46 +01:00
GregTCLTK
6649f0b092
Translation for Role and Rules command 2019-12-11 19:43:08 +01:00
GregTCLTK
1104a40315
Rules Command Mentioned Role fix
#185
2019-12-10 16:35:37 +01:00
GregTCLTK
fc0a3d9cc1
Error message 2019-12-09 07:53:51 +01:00
Hax
910289d938 Hello my friend. I'm a fix 2019-12-08 21:36:12 +01:00
GregTCLTK
4982196fb1
Role Mention fix 2019-12-06 17:38:23 +01:00
GregTCLTK
f838793e19
Rules Command improvement 2019-12-02 19:31:15 +01:00
GregTCLTK
e7e55e44ba
Rules Command feature 2019-12-02 18:38:43 +01:00
GregTCLTK
133ef8791c
I would call it "better code" 2019-11-30 12:42:50 +01:00
GregTCLTK
922bc357a4
Again a fix for the Rules Command 2019-11-24 19:50:26 +01:00
GregTCLTK
c016d1246d
Very nice fix 2019-11-24 15:19:44 +01:00
GregTCLTK
b81d4821fa
sdf 2019-11-24 14:25:15 +01:00
GregTCLTK
f4118f2958
fck 2019-11-24 14:24:57 +01:00
GregTCLTK
c0d25b7ae1
Rules MESSAGE_WRITE check 2019-11-23 03:49:53 -08:00
GregTCLTK
ef1b1e1d24
Some owner stuff 2019-11-22 16:06:05 -08: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
1cbd2e0af9
Rules Fix 2019-11-22 14:34:16 -08:00
GregTCLTK
71930bef17
Channel must be on the same guild 2019-11-22 05:55:36 -08: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
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