Merge Greg's branch into Hax's branch #228

Merged
greg6775 merged 21 commits from greg-dev into hax-dev 2019-12-21 18:10:28 +01:00

21 commits

Author SHA1 Message Date
GregTCLTK
81dedc87d7
New permission system
!!!
2019-12-21 17:44:34 +01:00
GregTCLTK
c88a8849ff
Avatar Command fix 2019-12-21 16:33:45 +01:00
GregTCLTK
7a9c2172d8
Nothing special 2019-12-21 16:32:21 +01:00
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
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