Changes

Summary

  1. Fix merge conflicts. (details)
Commit 2130aaa8703811b96ddf40b73cf46f4e00481bb4 by md_5 (md_5)
Fix merge conflicts.
The file was modifiedCraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch
The file was modifiedCraftBukkit-Patches/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch
The file was modifiedCraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch
The file was modifiedCraftBukkit-Patches/0056-BungeeCord-Support.patch
The file was modifiedCraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was modifiedCraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch
The file was modifiedCraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
The file was modifiedCraftBukkit-Patches/0005-Spigot-Configuration.patch
The file was modifiedCraftBukkit-Patches/0087-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
The file was modifiedCraftBukkit-Patches/0030-Configurable-Messages.patch
The file was modifiedCraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
The file was modifiedCraftBukkit-Patches/0144-Only-fetch-an-online-UUID-in-online-mode.patch
The file was modifiedBukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
The file was modifiedCraftBukkit-Patches/0012-Spigot-Timings.patch
The file was modifiedCraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch