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

..

GuiImgButton.java

Slowly working towards crafting.

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

GuiProgressBar.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

GuiScrollbar.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

GuiTabButton.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

GuiToggleButton.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

IScrollSource.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

ISortSource.java

Removed Sort By in security terminal.

2014-02-05 23:08:05 -06:00

ITooltip.java

Fixing up invisible widgets and redstone enum changes.

2014-01-05 02:41:03 -06:00

MEGuiTextField.java

Standard and Auto Search Settings.

2014-02-16 03:09:20 -06:00