2 Commits

Author	SHA1	Message	Date
Aikar	dbc4c29d6c	Merge branch 'master' into pre/1.13 ... * master: Fix "MC-135506: Experience should save as Integers" still saving as short" (#1301)	2018-08-03 09:27:01 -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