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
|
9ba00c81cf
|
Merge remote-tracking branch 'origin/greg-dev' into greg-dev
|
2019-12-18 17:45:43 +01:00 |
|
GregTCLTK
|
47be983996
|
...
|
2019-12-18 17:40:45 +01:00 |
|
Skidder
|
27eae71762
|
Merge branch 'master' into i18n
|
2019-12-18 17:35:57 +01:00 |
|
Skidder
|
cfcb7dd12b
|
New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
|
2019-12-18 17:31:01 +01:00 |
|
Skidder
|
80e1c7cde2
|
New translations Translations_en.properties (Turkish)
New Turkish translation
|
2019-12-18 17:30:59 +01:00 |
|
Skidder
|
94748d1012
|
New translations Translations_en.properties (Russian)
New Russian translation
|
2019-12-18 17:30:57 +01:00 |
|
Skidder
|
df95f17710
|
New translations Translations_en.properties (French)
New French translation
|
2019-12-18 17:30:55 +01:00 |
|
Skidder
|
839afd2e99
|
New translations Translations_en.properties (Spanish)
New Spanish translation
|
2019-12-18 17:30:53 +01:00 |
|
Skidder
|
cc297ed9ca
|
New translations Translations_en.properties (English)
New English translation
|
2019-12-18 17:30:52 +01:00 |
|
Skidder
|
5fcf631293
|
New translations Translations_en.properties (German)
New German translation
|
2019-12-18 17:30:50 +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 |
|
Skidder
|
9e869e8c97
|
New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
|
2019-12-14 13:10:45 +01:00 |
|
Skidder
|
4eb0a4d0ff
|
New translations Translations_en.properties (Turkish)
New Turkish translation
|
2019-12-14 13:10:44 +01:00 |
|
Skidder
|
4dd1a2be56
|
New translations Translations_en.properties (Russian)
New Russian translation
|
2019-12-14 13:10:42 +01:00 |
|
Skidder
|
ab574fe28a
|
New translations Translations_en.properties (French)
New French translation
|
2019-12-14 13:10:41 +01:00 |
|
Skidder
|
0e41d4c7b0
|
New translations Translations_en.properties (Spanish)
New Spanish translation
|
2019-12-14 13:10:39 +01:00 |
|
Skidder
|
61856be41d
|
New translations Translations_en.properties (English)
New English translation
|
2019-12-14 13:10:38 +01:00 |
|
Skidder
|
9f3883059b
|
New translations Translations_en.properties (German)
New German translation
|
2019-12-14 13:10:36 +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 |
|
Skidder
|
ebe33c72c3
|
New translations Translations_en.properties (German)
New German translation
|
2019-12-14 00:50:33 +01:00 |
|
Hax
|
805ac1975e
|
Added StarBoard
|
2019-12-13 20:20:01 +01:00 |
|
Skidder
|
0f666b27ed
|
New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
|
2019-12-13 13:50:50 +01:00 |
|
Skidder
|
28bfd63f1e
|
New translations Translations_en.properties (Turkish)
New Turkish translation
|
2019-12-13 13:50:48 +01:00 |
|
Skidder
|
451296d875
|
New translations Translations_en.properties (Russian)
New Russian translation
|
2019-12-13 13:50:47 +01:00 |
|
Skidder
|
d8702ebb27
|
New translations Translations_en.properties (French)
New French translation
|
2019-12-13 13:50:45 +01:00 |
|
Skidder
|
b15b799270
|
New translations Translations_en.properties (Spanish)
New Spanish translation
|
2019-12-13 13:50:43 +01:00 |
|
Skidder
|
7d1f032937
|
New translations Translations_en.properties (English)
New English translation
|
2019-12-13 13:50:41 +01:00 |
|
Skidder
|
6ae7aa07ce
|
New translations Translations_en.properties (German)
New German translation
|
2019-12-13 13:50:40 +01:00 |
|
Skidder
|
d6746f772a
|
Merge branch 'master' into i18n
|
2019-12-13 13:44:35 +01:00 |
|