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

..

AEMultiTile.java

Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup.

2014-04-06 01:55:24 -05:00

DualityInterface.java

Slowly working towards crafting.

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

ICustomCollision.java

Allow Visual/Non Visual Boxes to differ for Custom Collsion / Buses.

2014-01-31 11:11:50 -06:00

ICustomNameObject.java

Added Meteorite Spawn Distance Setting.

2014-03-15 01:58:21 -05:00

IInterfaceHost.java

Started working on crafting infrastructure and C-Cpus

2014-05-08 23:10:12 -05:00

InventoryAction.java

Added Shit+Mouse wheel to pick up / drop items.

2014-05-12 23:11:19 -05:00

IPriorityHost.java

Pretty much all of security minus the gui.

2014-01-26 22:00:36 -06:00

LocationRotation.java

Added Rotatable Blocks integration.

2014-04-03 23:12:35 -05:00

MetaRotation.java

Ported to 1.7

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

MeteoritePlacer.java

Removed Alpha Migration.

2014-05-15 21:18:30 -05:00

NullRotation.java

Fixed invalid Orientation.

2014-03-22 13:27:44 -05:00

PatternHelper.java

Started working on crafting infrastructure and C-Cpus

2014-05-08 23:10:12 -05:00

PlayerSecuirtyWrapper.java

Add better custom security features.

2014-05-12 23:15:46 -05:00

WirelessTerminalGuiObject.java

API Sync.

2014-03-25 12:13:34 -05:00