Commit graph

115 commits

Author SHA1 Message Date
GregTCLTK
ac92159078
starboard yk 2019-12-18 17:46:55 +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
Hax
805ac1975e Added StarBoard 2019-12-13 20:20:01 +01:00
GregTCLTK
ff67f45b4c
Merge @someone into MentionListener 2019-12-12 20:53:16 +01:00
Hax
310794b37c Add @someone 2019-12-11 20:53:04 +01:00
GregTCLTK
562f520dfa
Language command 2019-12-07 12:09:53 +01:00
GregTCLTK
615af65253
About Command 2019-12-05 16:42:49 +01:00
GregTCLTK
6e1718c46e
Region change command 2019-12-04 17:36:43 +01:00
GregTCLTK
805eb78c25
Update and add new NSF commands 2.0 2019-12-03 20:14:04 +01:00
GregTCLTK
292a1d5c79
Update and add new NSFW commands 2019-12-03 20:02:22 +01:00
GregTCLTK
c3d22e87d8
BDSM Command 2019-12-03 19:44:31 +01:00
GregTCLTK
9125d1b6d5
Triggers timeout 2019-12-02 20:58:54 +01:00
GregTCLTK
40e4215d60
Invite Link Detector 2019-12-02 08:28:20 +01:00
GregTCLTK
eac328ea6b
setAutoReconnect 2019-11-30 20:21:11 +01:00
GregTCLTK
b07ce74bad
Some nice stuff 2019-11-25 20:43:17 +01:00
GregTCLTK
a53c049059
Leave and GuildLeave 2019-11-24 18:27:59 +01:00
GregTCLTK
9bc4d897a5
Music Bot 😏 2019-11-24 17:17:07 +01:00
GregTCLTK
53ef9fb1ff
Introducing Eval Command 2019-11-23 03:08:33 -08:00
GregTCLTK
399aade130
Better code 2019-11-23 02:54:07 -08:00
GregTCLTK
df8e0dc752
Avatar Command 2019-11-22 16:30:57 -08:00
Hax
fed24d2a7f
Merge branch 'master' into hax-dev 2019-11-22 22:23:43 +01:00
Hax
d1b2483d0f Added Help when args are missing or are false 2019-11-22 22:21:43 +01:00
Hax
b2a47da482 Added LinkCommand, Added multithreading 2019-11-22 21:47:13 +01:00
GregTCLTK
834b23832e
Introducing Feedback Command :D 2019-11-22 04:23:34 -08:00
GregTCLTK
4550179994
Very very bad Rules Command. I'll fix this later 2019-11-20 11:55:31 -08:00
GregTCLTK
0a04c8185f
Rules Command 1/? 2019-11-20 09:58:27 -08:00
Hax
664c2b9db0 wtf, please fix this tomorrow 2019-11-19 23:50:13 +01:00
GregTCLTK
5b80a9f24b
9 very nice Commands 😏 2019-11-17 15:58:16 +01:00
GregTCLTK
a5907ef139
AddRole to Role 2019-11-17 00:11:01 +01:00
Hax
e3a5344fde Auto stash before merge of "hax-dev" and "origin/master" 2019-11-16 22:46:41 +01:00
GregTCLTK
0b644af5ac
Better Code 2019-11-16 17:00:35 +01:00
GregTCLTK
e3a943fdb0
Introducing the Nick Command 2019-11-15 15:48:52 +01:00
GregTCLTK
5be7bd2f8e
New Invite Command 2019-11-15 15:19:34 +01:00
GregTCLTK
352a772fe5
Hello my friends 2019-11-10 13:16:03 +01:00
GregTCLTK
8f6d51a2b6
Fixing Gif Command 2019-11-04 20:54:10 +01:00
Hax
fcb33ef5c7 Updated some things 2019-11-04 18:15:51 +01:00
Hax
66c8243fb0 Merge remote-tracking branch 'origin/greg-dev' into dev-merge 2019-11-03 20:37:55 +01:00
Hax
a5951c47ea Hello, i changed everything and it works
Changed Stuff:
Command System
Database Connection
Config Reader
Command Event

Please sub to bbn Pog
2019-11-03 20:31:50 +01:00
GregTCLTK
c96792f7c9 Public ShardManager 2019-11-03 01:30:49 +01:00
Hax
961dedbc31 Added Equals Command, Screenshare Command and introduced Eventwaiters 2019-11-02 20:12:23 +01:00
GregTCLTK
de0562753a english 2019-11-02 15:14:05 +01:00
GregTCLTK
1741885006 Merge branch 'greg-dev' of https://github.com/BigBotNetwork/Hadder into greg-dev 2019-10-31 19:52:24 +01:00
GregTCLTK
b1061cd877 startBot() 2019-10-31 19:51:13 +01:00
Hax
5611d0dede Edited Command System, added Help Command 2019-10-31 17:17:35 +01:00
GregTCLTK
b018a293ab Adding GitHub Stats Command 2019-10-30 21:32:35 +01:00
GregTCLTK
f91aca21ee Moving Test Command 2019-10-30 16:26:41 +01:00
GregTCLTK
a0478a0ba9 fix 2019-10-28 19:13:11 +01:00
GregTCLTK
539eee6afb Merge branch 'greg-dev' of https://github.com/BigBotNetwork/Hadder into greg-dev 2019-10-28 19:10:13 +01:00
GregTCLTK
8e18cff02d Clear Command and other stuff 2019-10-28 19:10:10 +01:00