Christian c0b707a9bd Merge branch 'master' into minecraft1.3 ... Bring some of the ticking fixes in Conflicts: client/cpw/mods/fml/client/FMLClientHandler.java patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch		2012-07-05 15:30:21 -04:00
..
minecraft/src	Merge branch 'master' into minecraft1.3	2012-07-05 15:30:21 -04:00