AlgorithmX2 68993534d9 Slowly working towards crafting. ... Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 Conflicts: client/gui/widgets/GuiImgButton.java core/localization/ButtonToolTips.java		2014-05-18 20:05:03 -05:00
..
implementations	Slowly working towards crafting.	2014-05-18 20:05:03 -05:00
IAECluster.java	AE2 First Commit, the dawn of 1.7 hast arrived.	2013-12-27 16:59:59 -06:00
IAEMultiBlock.java	AE2 First Commit, the dawn of 1.7 hast arrived.	2013-12-27 16:59:59 -06:00
MBCalculator.java	Ported to 1.7	2014-02-08 19:34:52 -06:00