SuccessChanges

Summary

  1. Clean upstream before merging to ensure clean state (commit: a32840b) (details)
  2. Try to improve Timings stack management (commit: 747e70a) (details)
  3. Improve upstream merge script to rebuild patches (commit: 96f8b1a) (details)
  4. Updated Upstream (CraftBukkit/Spigot) (commit: e9b353f) (details)
Commit a32840b44974045a24260732cb01e700f61184d9 by aikar
Clean upstream before merging to ensure clean state
(commit: a32840b)
The file was modifiedscripts/upstreamMerge.sh (diff)
Commit 747e70a90df4215742343270a40bf467c65bd8f6 by aikar
Try to improve Timings stack management
I can't reproduce issues locally, but this should be even more 'stable'
(commit: 747e70a)
The file was modifiedSpigot-API-Patches/0004-Timings-v2.patch (diff)
Commit 96f8b1af6c4e06d91b82fe624cccf410a3427f99 by aikar
Improve upstream merge script to rebuild patches
this will help ensure that upstreams apply as cleanly as it does
manually
the filtering makes the patches more fragile, but usually not an issue
for small updates.
this will unfilter, apply the cleanest patches, then the next rebuild
will filter out unnecessary changes
(commit: 96f8b1a)
The file was modifiedscripts/rebuildPatches.sh (diff)
The file was modifiedscripts/upstreamMerge.sh (diff)
Commit e9b353ff02dedb21b11053ee371eb1034fbf395d by aikar
Updated Upstream (CraftBukkit/Spigot)
We pretty much reverted most of Spigots changes here as ours is better.
I guess least Spigot is trying to get closer to us? but missed..
CraftBukkit Changes: 0bf75bbd SPIGOT-4686: Enchantment ordering
nondeterministic
Spigot Changes: f09662d0 Rebuild patches
(commit: e9b353f)
The file was modifiedwork/Spigot (diff)
The file was modifiedSpigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch (diff)
The file was modifiedSpigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch (diff)
The file was modifiedwork/CraftBukkit (diff)
The file was modifiedSpigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch (diff)