Commit graph

73 commits

Author SHA1 Message Date
GregTCLTK
4a7d6ea2d1
A lot of better code 2020-02-20 20:58:15 +01:00
GregTCLTK
ec6c8c7527
moving vlog #2 2020-02-16 15:10:46 +01:00
GregTCLTK
e178c724f9
Fix blacklist 2020-02-07 00:35:49 +01:00
GregTCLTK
9a9eb334f0
Revert null in the blc 2020-02-02 16:10:02 +01:00
GregTCLTK
2d9fb1e1e4
Better help 2020-02-01 22:37:49 +01:00
GregTCLTK
cdff88174f
Codacy stuff 2020-01-29 08:30:59 +01:00
GregTCLTK
0b4cc1e792
Blacklist i18n 2020-01-29 08:26:36 +01:00
GregTCLTK
fe965a5cf7
🤔 2020-01-24 17:34:50 +01:00
Hax
b7d0d365b6 OFJSEfplömnsdf#g 2020-01-22 21:33:54 +01:00
GregTCLTK
5bba1ab9c3
Rename event to e in Perm class 2020-01-21 19:04:04 +01:00
GregTCLTK
115389e272
Codacy 2020-01-21 17:18:28 +01:00
GregTCLTK
3df08c5e13
Fix some event stuff 2020-01-21 08:23:27 +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
22dacda281 Added Permissions 2020-01-20 21:55:10 +01:00
Hax
229d3f2a3f Improved Database Performance, Added Test Echo Command 2020-01-20 21:54:16 +01:00
GregTCLTK
607d633d7f
Rename event to e 2020-01-20 18:37:05 +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
Hax
31b1d96a84 BlacklistCommand be like 2020-01-01 15:53:05 +01:00
GregTCLTK
b77e99fc7d
Unused imports 2019-12-31 14:47:11 +01:00
GregTCLTK
78b8a51a18
Warning -> Error 2019-12-31 13:49:35 +01:00
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +01:00
GregTCLTK
9d0f60fe56
Didn't work lul 2019-12-30 13:50:01 +01:00
GregTCLTK
5059e7b165 Continue later 2019-12-30 03:47:01 +01:00
GregTCLTK
aa435eac9a
Codacy issue fix 2019-12-28 21:53:27 +01:00
GregTCLTK
8d19b9ae07
Info Command 2019-12-28 14:14:45 +01:00
Hax
c3aaa9a238 Ez fix 2019-12-28 13:24:39 +01:00
Hax
c0d39f3624 Auto stash before merge of "hax-dev" and "origin/greg-dev" 2019-12-28 13:13:03 +01:00
GregTCLTK
6e73bcb554
fdsg 2019-12-28 13:12:10 +01:00
GregTCLTK
fcaaa68daa
Removed unused imports 2019-12-21 18:43:23 +01:00
GregTCLTK
81dedc87d7
New permission system
!!!
2019-12-21 17:44:34 +01:00
GregTCLTK
3215af2ac3
Move 2019-12-21 12:03:30 +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
Hax
deb59caad2 what 2019-12-18 18:05:14 +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
5009937fe2
Clear Command improvements 2019-12-14 11:55:14 +01:00
GregTCLTK
200454e3fa
Owner Commands translation 2019-12-13 13:05:30 +01:00
GregTCLTK
d2fb3a96ff
🤔 2019-12-11 19:25:38 +01:00
GregTCLTK
ab752205e0
Help Command improvement 2019-12-08 01:40:09 +01:00
GregTCLTK
67faa70aaf
More code improvements 2019-12-02 08:56:36 +01:00
GregTCLTK
79c6e5ddee
Eval Command fix 2019-12-02 08:43:48 +01:00