4 Commits

Autor	SHA1	Nachricht	Datum
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	db81205dd7	Merge branch 'master' into pre/1.13	2018-07-31 16:44:46 -05:00
Zach Brown	96ce4bd9fd	Update upstream B/CB	2018-07-30 20:19:41 -05:00
Aikar	c7dcc8ce89	Merge pull request #1244 ... 3e19de0c Rebuild Patches (BillyGalbreath) 8e5db995 AnvilDamageEvent (BillyGalbreath) * pull/1244/head: Rebuild Patches AnvilDamageEvent	2018-07-30 00:12:03 -04:00