6 commits

Author	SHA1	Message	Date
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	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
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -04:00
Aikar	4f7a858bd6	Merge pull request #1248 ... c2d29a73 PlayerElytraBoostEvent (BillyGalbreath) * pull/1248/head: PlayerElytraBoostEvent Also merged paper config into parent	2018-07-23 20:29:55 -04:00
Shane Freeder	aad194a32e	Update B/CB/S	2018-07-23 09:44:57 +01:00

Renamed from Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch (Browse further)