Hax
|
c0d39f3624
|
Auto stash before merge of "hax-dev" and "origin/greg-dev"
|
2019-12-28 13:13:03 +01:00 |
|
GregTCLTK
|
6e73bcb554
|
fdsg
|
2019-12-28 13:12:10 +01:00 |
|
GregTCLTK
|
3215af2ac3
|
Move
|
2019-12-21 12:03:30 +01:00 |
|
Hax
|
f32fc9b4bd
|
Just some stuff
|
2019-12-18 18:50:48 +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
|
5009937fe2
|
Clear Command improvements
|
2019-12-14 11:55:14 +01:00 |
|
GregTCLTK
|
200454e3fa
|
Owner Commands translation
|
2019-12-13 13:05:30 +01:00 |
|
GregTCLTK
|
d2fb3a96ff
|
🤔
|
2019-12-11 19:25:38 +01:00 |
|
GregTCLTK
|
ab752205e0
|
Help Command improvement
|
2019-12-08 01:40:09 +01:00 |
|
GregTCLTK
|
79c6e5ddee
|
Eval Command fix
|
2019-12-02 08:43:48 +01: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 |
|
GregTCLTK
|
5eb0489d54
|
Not needed
|
2019-11-23 05:42:18 -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 |
|