Commit graph

67 commits

Author SHA1 Message Date
Hax
9940454f7e Merge remote-tracking branch 'origin/master' into hax-dev 2020-01-28 14:21:32 +01:00
Hax
b94be60fd7 ReactionEventWaiter 2020-01-28 14:21:16 +01:00
GregTCLTK
fe965a5cf7
🤔 2020-01-24 17:34:50 +01:00
GregTCLTK
1787f67ab3
Rename get 2020-01-24 16:25:23 +01:00
GregTCLTK
a939d29c39
200IQ 2020-01-21 17:31:09 +01:00
GregTCLTK
115389e272
Codacy 2020-01-21 17:18:28 +01:00
Skidder
03042cc239
Merge branch 'greg-dev' into hax-dev 2020-01-21 08:18:34 +01:00
GregTCLTK
a806d96bb0
#337 2020-01-21 08:13:12 +01:00
Hax
229d3f2a3f Improved Database Performance, Added Test Echo Command 2020-01-20 21:54:16 +01:00
GregTCLTK
d53f92f573
Fix v2 api requests 2020-01-20 20:31:19 +01:00
GregTCLTK
c094a0e5f1
Request file lol 2020-01-20 19:11:34 +01:00
GregTCLTK
8cb9613fd6
New JSON String... 2020-01-02 22:42:28 +01:00
GregTCLTK
ad598590b6
New bot list 2020-01-02 22:41:04 +01:00
GregTCLTK
0d0b8affbc
Some code improvements again 2020-01-01 21:25:10 +01:00
GregTCLTK
51b3e76fb8
New bot list 2020-01-01 16:37:58 +01:00
GregTCLTK
b77e99fc7d
Unused imports 2019-12-31 14:47:11 +01:00
GregTCLTK
ef3aed7938 Screenshare improvement 2019-12-31 03:51:20 +01:00
GregTCLTK
29dd178715 CONTINUE WORK LATER!!! 2019-12-30 03:46:43 +01:00
GregTCLTK
551bb13cbc
Some fixes 2019-12-28 21:42:06 +01:00
GregTCLTK
50163ca1b0
Bug fixes and improvements 2019-12-28 15:22:03 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
GregTCLTK
a7c9578ee5
Music stuff yk 2019-12-22 14:46:21 +01:00
GregTCLTK
4f7f675a8a
Update 2019-12-22 11:12:01 +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
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
6a19ed4d26
NoNSFW Embed 2019-12-12 20:46:23 +01:00
GregTCLTK
6649f0b092
Translation for Role and Rules command 2019-12-11 19:43:08 +01:00
GregTCLTK
46bb510997
%extra%
Not by the GottBot
2019-12-11 17:34:52 +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
GregTCLTK
989fc12779
Translation test 2019-12-07 02:05:23 +01:00
GregTCLTK
f838793e19
Rules Command improvement 2019-12-02 19:31:15 +01:00
GregTCLTK
8bea23f41b
4 more improvements 2019-12-02 09:11:15 +01:00
GregTCLTK
6cb0ab4c4b
Remove ":" 2019-12-01 10:02:12 +01:00
GregTCLTK
d414539814
Add BotList.Space 2019-12-01 09:53:22 +01:00
GregTCLTK
133ef8791c
I would call it "better code" 2019-11-30 12:42:50 +01:00
GregTCLTK
b07ce74bad
Some nice stuff 2019-11-25 20:43:17 +01:00
GregTCLTK
e07a821302
This should work 🤔 2019-11-25 14:14:46 +01:00
Skidder
f0b0491afc
B 2019-11-25 12:22:57 +01:00
GregTCLTK
0ef3b96ae3
f 2019-11-25 09:23:23 +01:00
GregTCLTK
137aeddbdb
New Bot List :) 2019-11-25 08:53:48 +01:00
GregTCLTK
9bc4d897a5
Music Bot 😏 2019-11-24 17:17:07 +01:00
GregTCLTK
68303f1d9e
Role remove Command but it's buggy 2019-11-22 13:11:34 -08:00
GregTCLTK
66657623b3
OOOFFFFFF 2019-11-22 06:35:27 -08:00
GregTCLTK
f59d66a65f
Discord Bot Reviews 2019-11-21 11:29:47 -08:00
GregTCLTK
c95b8d6c54
Very nice improvements 2019-11-17 01:32:33 +01:00
GregTCLTK
b9ddfc5951
Fix... 2019-11-16 22:54:22 +01:00