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

..

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

Allow security hand shakes for monitorables.

2014-04-17 22:33:48 -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

Tile Saving

2014-01-30 18:50:11 -06:00

InventoryAction.java

Fixed issue with Terminal Inventories on Servers.

2014-02-09 18:56:35 -06: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

Meteorite Chests now can contain other nuggets, and not use AE's nuggets when they are disabled.

2014-04-27 23:49:14 -05:00

NullRotation.java

Fixed invalid Orientation.

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

PatternHelper.java

Added Basic Restrictions on slots in MAC.

2014-04-24 20:55:29 -05:00

WirelessTerminalGuiObject.java

API Sync.

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