Christian df132a0296 Merge branch 'displayname' of github.com:MachineMuse/MinecraftForge into sometweaks ... Conflicts: patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch		2013-09-05 08:20:49 -04:00
..
classloading	Add some starting work for a forge tps command. Also update coremod for new FML behaviour	2013-08-27 23:07:30 -04:00
common	Update version to 9.10.1 for mcp naming changes.	2013-09-03 18:09:07 -04:00
event	Added display name hook	2013-09-03 14:55:11 -06:00
fluids	Small fix to container registry. emptyContainer is not null, it's "NULL_EMPTYCONTAINER" now and won't match any valid container.	2013-08-28 22:16:59 -04:00
liquids	Update forge for MCP naming updates	2013-09-03 18:04:12 -04:00
oredict	Update OreDictionary.java	2013-06-17 19:09:40 -03:00
server	Update forge for MCP naming updates	2013-09-03 18:04:12 -04:00
transformers	Initial patch update to 1.6, Does not compile, need to update references to the old TexturePack system.	2013-06-30 05:50:11 -07:00