Upstream has released updates that appears to apply and compile correctly
Paper Changes:
fcbeac8a [CI-SKIP] Readme update (#3702)
824f8086 Bandaid italic legacy serialization #3757 (#3760)
Tuinity Changes:
9f21359: Re-add optimise collision checking in player move packet handling
1152054: Revert player move packet optimisation
ef0a6c4: Optimise collision checking in player move packets
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes#1965, Closes#1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)