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
..
ButtonToolTips.java	Large chunk on the pattern terminal.	2014-04-09 23:51:08 -05:00
GuiText.java	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-03 14:12:19 -05:00
PlayerMessages.java	Ported to 1.7	2014-02-08 19:34:52 -06:00
WailaText.java	Added Waila Integration.	2014-02-19 21:16:41 -06:00