Christian 50992f2112 Merge branch 'master' of github.com:KingLemming/MinecraftForge into newliquid ... Conflicts: common/net/minecraftforge/common/network/ForgePacket.java		2013-05-27 18:16:24 -04:00
..
net/minecraftforge	Merge branch 'master' of github.com:KingLemming/MinecraftForge into newliquid	2013-05-27 18:16:24 -04:00
forge_at.cfg	EntityPlayer sensitive version of Item.isValidArmor, deprecated older version. Closes #551	2013-05-08 15:09:53 -07:00