Christian 331e6bcf62 Merge branch 'master' into snapshot15 ... Fix up compilation and patching errors Conflicts: common/cpw/mods/fml/common/registry/GameRegistry.java conf/joined.srg conf/params.csv conf/version.cfg patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch		2013-01-22 15:21:22 -05:00
..
net/minecraft	Merge branch 'master' into snapshot15	2013-01-22 15:21:22 -05:00