Christian 9cdbadb66c Merge branch 'master' into repackage ... Conflicts: patches/minecraft/net/minecraft/client/EntityFX.java.patch		2012-12-03 17:31:29 -05:00
..
common/net/minecraft	Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config.	2012-11-19 17:45:53 -08:00
minecraft/net/minecraft/client	Merge branch 'master' into repackage	2012-12-03 17:31:29 -05:00