Changes

Summary

  1. Fix conflicts. (details)
Commit f234263c871f8beab6fd34f0b39b0cfd94daf234 by md_5 (md_5)
Fix conflicts.
The file was modifiedCraftBukkit-Patches/0032-Properly-Close-Inventories.patch
The file was modifiedCraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch
The file was modifiedCraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch
The file was modifiedCraftBukkit-Patches/0012-Spigot-Timings.patch
The file was modifiedCraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch
The file was modifiedCraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch
The file was modifiedCraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch
The file was modifiedCraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch