6 commits

Author	SHA1	Message	Date
Aikar	b9b32ba7dc	Update upstream	2018-07-29 22:16:15 -04:00
Shane Freeder	f7d02b2518	Update CB/S	2018-07-28 03:38:13 +01:00
Aikar	480011c529	restore uuid to Entity.toString	2018-07-24 00:48:07 -04:00
Shane Freeder	aad194a32e	Update B/CB/S	2018-07-23 09:44:57 +01:00
Aikar	bf2c56e8ae	Readd configurable max chunk gens per tick	2018-07-21 17:24:18 -04:00
Aikar	1d28f62522	Rebuild patches for upstream merge	2018-07-21 16:43:00 -04:00