4 commits

Author	SHA1	Message	Date
stonar96	3a9f17bc4b	Anti Xray v2 (#858)	2017-10-05 14:38:21 +01:00
Shane Freeder	9f7b45a945	Update CB, refactor 0229-Fix-this-stupid-bullshit ... Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.	2017-09-15 15:37:05 +01:00
Aikar	64b2b87256	Upstream update	2017-08-07 23:05:16 -04:00
DemonWav	2b47debe1e	Fix this stupid bullshit	2017-08-06 17:18:20 -05:00