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
..
cpw/mods/fml	Merge branch 'master' into snapshot15	2013-01-22 15:21:22 -05:00
fml_at.cfg	A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone	2013-01-12 00:17:35 -05:00
fml_marker.cfg	Initial setup for snapshot- the client compiles, but patches fail to apply.	2013-01-11 22:49:09 -05:00
mcpmod.info	Merge branch 'master' into snapshot15	2013-01-22 15:21:22 -05:00