11 Commits

Author	SHA1	Message	Date
Aikar	9078464e74	Merge branch 'master' into pre/1.13 ... * master: make dupe uuid saferegen delete range configurable Entity add to world fixes - #1223	2018-08-04 00:33:21 -04:00
Aikar	dc3dc77245	fix missing | on dupe uuid patch	2018-08-03 08:51:04 -04:00
Aikar	751317f21b	Merge branch 'master' into pre/1.13 ... * master: fix missed break statement and enum check on dupe uuid resolve	2018-08-03 01:33:34 -04:00
Aikar	0f479b740d	Merge branch 'master' into pre/1.13 ... * master: MC-135506: Experience should save as Integers Fix EXP orb merging causing values to go negative - Closes #1169 Add "Safe Regen" Duplicate UUID resolver and make default	2018-08-03 01:29:20 -04:00
Zach Brown	96ce4bd9fd	Update upstream B/CB	2018-07-30 20:19:41 -05:00
Aikar	76e1e4d79f	Update Upstream ... Removed my ChunkLoadEvent patch as upstream fixed it	2018-07-30 01:08:59 -04:00
Aikar	b9b32ba7dc	Update upstream	2018-07-29 22:16:15 -04:00
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Shane Freeder	aad194a32e	Update B/CB/S	2018-07-23 09:44:57 +01:00
Aikar	4b66f1978d	Update upstream	2018-07-22 13:10:15 -04:00
Aikar	bf2c56e8ae	Readd configurable max chunk gens per tick	2018-07-21 17:24:18 -04:00