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 |
|
Skidder
|
cb9ef4c8e1
|
Merge pull request #215 from BigBotNetwork/dependabot/maven/greg-dev/org.slf4j-slf4j-simple-1.7.30
Bump slf4j-simple from 1.7.29 to 1.7.30
|
2019-12-17 15:40:53 +01:00 |
|
dependabot-preview[bot]
|
901c3c2249
|
Bump slf4j-simple from 1.7.29 to 1.7.30
Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-17 13:36:56 +00:00 |
|
dependabot-preview[bot]
|
0c00e32e51
|
Bump JDA from 4.0.0_73 to 4.0.0_78
Bumps JDA from 4.0.0_73 to 4.0.0_78.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-17 13:36:32 +00:00 |
|
dependabot-preview[bot]
|
ea402eb3a0
|
Bump slf4j-api from 1.7.29 to 1.7.30
Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.29 to 1.7.30.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.29...v_1.7.30)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-17 13:36:12 +00: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 |
|
Skidder
|
54fd0af46e
|
Merge pull request #208 from BigBotNetwork/greg-dev
Greg dev
|
2019-12-14 13:05:32 +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 |
|
Skidder
|
e7a02d745e
|
New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
|
2019-12-13 13:40:52 +01:00 |
|
Skidder
|
ad72c9d0ec
|
New translations Translations_en.properties (Turkish)
New Turkish translation
|
2019-12-13 13:40:50 +01:00 |
|
Skidder
|
535c8d8bf2
|
New translations Translations_en.properties (Russian)
New Russian translation
|
2019-12-13 13:40:48 +01:00 |
|
Skidder
|
22dc7456f3
|
New translations Translations_en.properties (French)
New French translation
|
2019-12-13 13:40:47 +01:00 |
|
Skidder
|
82c8cb5344
|
New translations Translations_en.properties (Spanish)
New Spanish translation
|
2019-12-13 13:40:46 +01:00 |
|
Skidder
|
37eb92d88a
|
New translations Translations_en.properties (English)
New English translation
|
2019-12-13 13:40:44 +01:00 |
|
Skidder
|
89ef0017d6
|
New translations Translations_en.properties (German)
New German translation
|
2019-12-13 13:40:42 +01:00 |
|
Skidder
|
5903f9efb0
|
Merge pull request #203 from BigBotNetwork/greg-dev
Greg dev
|
2019-12-13 13:33:53 +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 |
|
Skidder
|
d153b0e9b7
|
Merge pull request #202 from BigBotNetwork/master
Master
|
2019-12-13 12:51:49 +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 |
|