AlgorithmX2 900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	core/localization/GuiText.java

2014-05-31 20:58:52 -05:00

..

ButtonToolTips.java

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

GuiText.java

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-31 20:58:52 -05:00

PlayerMessages.java

Clear Memory Card When Shift Clicking on a non-machine / air.

2014-05-25 18:32:16 -05:00

WailaText.java

Added Waila Integration.

2014-02-19 21:16:41 -06:00