Skidder
|
bfd75b136b
|
Merge pull request #226 from BigBotNetwork/Schlauer-Hax-patch-1
Update MessageEditor.java
|
2019-12-21 15:03:30 +01:00 |
|
Hax
|
29374518ff
|
Update MessageEditor.java
|
2019-12-21 15:02:59 +01:00 |
|
GregTCLTK
|
3215af2ac3
|
Move
|
2019-12-21 12:03:30 +01:00 |
|
GregTCLTK
|
5a6316f296
|
2 new badges
|
2019-12-21 01:07:16 +01:00 |
|
GregTCLTK
|
04716fbc07
|
yk
|
2019-12-21 01:05:29 +01:00 |
|
GregTCLTK
|
d6e78b6a45
|
Prefix
|
2019-12-20 13:11:28 +01:00 |
|
GregTCLTK
|
5be162fd1a
|
Clyde i18n
|
2019-12-20 13:06:30 +01:00 |
|
GregTCLTK
|
08562562a5
|
Perms stuff yk
|
2019-12-19 21:10:15 +01:00 |
|
GregTCLTK
|
e7afeacce7
|
Top confidential Clyde command
|
2019-12-19 21:05:25 +01:00 |
|
GregTCLTK
|
860d035a63
|
Yeah Clyde Command
|
2019-12-19 19:30:51 +01:00 |
|
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
|
251c0a0d81
|
...
|
2019-12-18 19:56:56 +01:00 |
|
GregTCLTK
|
774bb88797
|
Removed three unused imports
|
2019-12-18 19:23:10 +01:00 |
|
Skidder
|
d434594afe
|
Merge pull request #224 from BigBotNetwork/hax-dev
Hax dev
|
2019-12-18 19:02:58 +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 |
|
GregTCLTK
|
a2f609e80e
|
d
|
2019-12-18 18:05:35 +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
|
b4d889b117
|
Merge pull request #220 from BigBotNetwork/master
i18n
|
2019-12-18 17:39:58 +01:00 |
|
Skidder
|
76fd4eed86
|
Merge pull request #219 from BigBotNetwork/i18n
New Crowdin translations
|
2019-12-18 17:37:49 +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 |
|
Skidder
|
11422d6498
|
Merge pull request #218 from BigBotNetwork/master
Joo
|
2019-12-18 17:27:59 +01:00 |
|
Skidder
|
7c2c6faeef
|
Merge pull request #217 from BigBotNetwork/greg-dev
✅
|
2019-12-18 17:27:21 +01:00 |
|
Skidder
|
2f55c5484b
|
Merge pull request #216 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_79
Bump JDA from 4.0.0_78 to 4.0.0_79
|
2019-12-18 17:26:09 +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 |
|
dependabot-preview[bot]
|
32ae2f7843
|
Bump JDA from 4.0.0_78 to 4.0.0_79
Bumps JDA from 4.0.0_78 to 4.0.0_79.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-18 13:47:06 +00:00 |
|
Skidder
|
ebdda85e29
|
Merge pull request #213 from BigBotNetwork/dependabot/maven/greg-dev/org.slf4j-slf4j-api-1.7.30
Bump slf4j-api from 1.7.29 to 1.7.30
|
2019-12-17 15:41:15 +01:00 |
|
Skidder
|
4866ad193c
|
Merge pull request #214 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_78
Bump JDA from 4.0.0_73 to 4.0.0_78
|
2019-12-17 15:41:04 +01:00 |
|