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

..

ButtonToolTips.java

Slowly working towards crafting.

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

GuiText.java

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -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