Changes

Summary

  1. Fix patch conflicts (details)
Commit 6f291eaafcba6387f4365eb8215f229f7950c3dc by md_5 (md_5)
Fix patch conflicts
The file was modifiedCraftBukkit-Patches/0010-Spigot-Timings.patch
The file was modifiedCraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
The file was modifiedCraftBukkit-Patches/0014-Entity-Activation-Range.patch
The file was modifiedCraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch
The file was modifiedCraftBukkit-Patches/0035-Player-Collision-API.patch
The file was modifiedCraftBukkit-Patches/0008-Async-Operation-Catching.patch
The file was modifiedCraftBukkit-Patches/0069-Cap-Entity-Collisions.patch