AlgorithmX2 3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ... Conflicts: core/localization/GuiText.java core/sync/AppEngPacketHandlerBase.java		2014-05-03 14:12:19 -05:00
..
ItemMaterial.java	Prevent Materials from crashing if they are disabled.	2014-04-27 23:50:26 -05:00
MaterialType.java	Crafting Begin.	2014-03-25 22:06:54 -05:00