4 Commits

Author	SHA1	Message	Date
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
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Aikar	c280d84172	Update upstream and remove hopper patch for #1270	2018-07-25 01:11:08 -04:00
Aikar	3ad50727b9	Merge pull request #1254 ... 0fbf3e77 Re-add Option to prevent armor stands from doing entity lookups (Hugo Manrique) * pull/1254/head: Re-add Option to prevent armor stands from doing entity lookups	2018-07-23 20:22:51 -04:00