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
..
implementations	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-03 14:12:19 -05:00
widgets	Large chunk on the pattern terminal.	2014-04-09 23:51:08 -05:00
AEBaseGui.java	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-03 14:12:19 -05:00
AEBaseMEGui.java	Item Counts now appear in tooltips for ME Slots.	2014-02-15 22:44:35 -06:00
GuiNull.java	AE2 First Commit, the dawn of 1.7 hast arrived.	2013-12-27 16:59:59 -06:00