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 |
|
Hax
|
d55746a6bf
|
Fixed the @Mention prefix
|
2019-12-12 21:36:23 +01:00 |
|
Hax
|
fed9298275
|
Quality Code
|
2019-12-12 21:11:36 +01:00 |
|
GregTCLTK
|
ff67f45b4c
|
Merge @someone into MentionListener
|
2019-12-12 20:53:16 +01:00 |
|
GregTCLTK
|
c5b717bd32
|
Merge remote-tracking branch 'origin/greg-dev' into greg-dev
|
2019-12-12 20:47:10 +01:00 |
|
GregTCLTK
|
507630b17f
|
NSFW Command Translation
|
2019-12-12 20:47:04 +01:00 |
|
GregTCLTK
|
b2f7347072
|
Music Command Translation
|
2019-12-12 20:46:57 +01:00 |
|
GregTCLTK
|
6a19ed4d26
|
NoNSFW Embed
|
2019-12-12 20:46:23 +01:00 |
|
Hax
|
875fb4cd8b
|
Merge remote-tracking branch 'origin/master' into hax-dev
|
2019-12-11 20:53:14 +01:00 |
|
Hax
|
310794b37c
|
Add @someone
|
2019-12-11 20:53:04 +01:00 |
|
GregTCLTK
|
6bb0a77db6
|
Music part 1
|
2019-12-11 20:08:08 +01:00 |
|
GregTCLTK
|
6649f0b092
|
Translation for Role and Rules command
|
2019-12-11 19:43:08 +01:00 |
|
GregTCLTK
|
d2fb3a96ff
|
🤔
|
2019-12-11 19:25:38 +01:00 |
|
GregTCLTK
|
38dfca5767
|
More translation improvements
|
2019-12-11 18:29:56 +01:00 |
|
GregTCLTK
|
5b039ee532
|
Translation improvements
|
2019-12-11 17:58:32 +01:00 |
|
GregTCLTK
|
46bb510997
|
%extra%
Not by the GottBot
|
2019-12-11 17:34:52 +01:00 |
|
GregTCLTK
|
b641f8a6b1
|
Forgot one
|
2019-12-10 20:19:25 +01:00 |
|
GregTCLTK
|
c18338dcf1
|
Second part of i18n integration
|
2019-12-10 20:03:37 +01:00 |
|
GregTCLTK
|
4adf6a8eb9
|
First part of i18n integration
|
2019-12-10 19:07:11 +01:00 |
|
GregTCLTK
|
c72ab90b82
|
getLanguage
|
2019-12-10 18:22:55 +01:00 |
|
GregTCLTK
|
ec5c7520dc
|
Move files again
Just for better structure
|
2019-12-10 17:42:55 +01:00 |
|
GregTCLTK
|
12f1cdfdcb
|
MessageEditor Handle funktion
|
2019-12-10 17:40:19 +01:00 |
|