Christian 9cdbadb66c Merge branch 'master' into repackage ... Conflicts: patches/minecraft/net/minecraft/client/EntityFX.java.patch		2012-12-03 17:31:29 -05:00
..
patches	Update FML for MC 1.4.5	2012-11-16 16:31:06 -05:00
astyle.cfg	Stage 1 of merging the client and server for MCP.	2012-08-08 05:48:06 -07:00
fields.csv	Update FML for MC 1.4.5	2012-11-16 16:31:06 -05:00
joined.exc	Merge joined.exc add update howto	2012-11-20 08:38:33 -05:00
joined.srg	Updated to 1.4.5b	2012-11-19 15:35:08 -08:00
mcp.cfg	Inital script side commit for MC source repackaging done.	2012-11-20 01:55:41 -08:00
methods.csv	Update FML for MC 1.4.5	2012-11-16 16:31:06 -05:00
newids.csv	Stage 1 of merging the client and server for MCP.	2012-08-08 05:48:06 -07:00
packages.csv	Finished repackaging net.minecraft.* net.minecraft.client is left	2012-11-20 17:58:22 -08:00
params.csv	Updated to 1.4.5b	2012-11-19 15:35:08 -08:00
version.cfg	Updated to 1.4.5b	2012-11-19 15:35:08 -08:00