7 Commits

Autor	SHA1	Nachricht	Datum
Aikar	05466e3b47	[Auto] Update Upstream ... Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types	2018-08-05 19:46:43 -04:00
Aikar	a4e7bdb306	[Auto] Rebuild Patches ... A recent commit has been made that caused patches to be out of order, rebuilding	2018-08-05 18:55:03 -04:00
Aikar	177ec197a7	Merge branch 'master' into pre/1.13 ... * master: Fix logic bug in negative XP bug fix - Closes #1169	2018-08-03 21:20:57 -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	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