3 commits

Author	SHA1	Message	Date
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Aikar	1b53a468de	Merge branch 'master' into pre/1.13 ... * master: Fix Dupe UUID logic triggering when the duplicate is pending unload	2018-07-28 01:59:20 -04:00
Aikar	7c5cc1ece7	Merge branch 'master' into pre/1.13 ... * master: Prevent Saving Bad entities to chunks	2018-07-26 00:57:16 -04:00