Conflicts:
	src/main/java/net/minecraft/command/CommandBase.java
	src/main/java/net/minecraft/command/CommandHandler.java
	src/main/java/net/minecraft/command/ServerCommandManager.java
	src/main/java/net/minecraft/command/server/CommandOp.java
	src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
	src/main/java/net/minecraft/network/NetHandlerPlayServer.java
	src/main/java/net/minecraft/network/rcon/RConThreadClient.java
	src/main/java/net/minecraft/network/rcon/RConThreadMain.java
	src/main/java/net/minecraft/network/rcon/RConThreadQuery.java
	src/main/java/net/minecraft/pathfinding/PathFinder.java
	src/main/java/net/minecraft/server/MinecraftServer.java
	src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
	src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
	src/main/java/net/minecraft/server/integrated/IntegratedServer.java
	src/main/java/net/minecraft/server/management/PlayerManager.java
	src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
	src/main/java/net/minecraft/world/ChunkCache.java
	src/main/java/net/minecraft/world/ChunkCoordIntPair.java
	src/main/java/net/minecraft/world/SpawnerAnimals.java
	src/main/java/net/minecraft/world/World.java
	src/main/java/net/minecraft/world/WorldServer.java
	src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
	src/main/java/net/minecraft/world/chunk/storage/AnvilSaveHandler.java
	src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
	src/main/resources/log4j2.xml