Merge Greg's branch into the master branch #293

Merged

greg6775 merged 5 commits from greg-dev into master

2020-01-01 17:07:10 +01:00

Author	SHA1	Message	Date
GregTCLTK	cce9730378	Some code improvements again	2020-01-01 16:49:08 +01:00
GregTCLTK	51b3e76fb8	New bot list	2020-01-01 16:37:58 +01:00
Skidder	9307b66c5e	Merge pull request #292 from BigBotNetwork/hax-dev Hax dev	2020-01-01 15:54:41 +01:00
Hax	31b1d96a84	BlacklistCommand be like	2020-01-01 15:53:05 +01:00
Hax	c6272c7f25	Merge remote-tracking branch 'origin/greg-dev' into hax-dev	2019-12-31 21:16:19 +01:00