Changes

Summary

1. Fix patch conflicts (details)

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