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

..

automation

Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 )

2014-04-17 22:52:21 -05:00

misc

Bug: #0386 - Memory Card not detect flat ME Interface

2014-05-01 00:41:19 -05:00

networking

Fiber don't use power.

2014-04-26 21:53:30 -05:00

p2p

Implemented 5% Tunnel Tax.

2014-05-02 00:40:46 -05:00

reporting

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

2014-05-03 14:12:19 -05:00

AEBasePart.java

Bug: #0386 - Memory Card not detect flat ME Interface

2014-05-01 00:41:19 -05:00

BusCollisionHelper.java

Ported to 1.7

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

CableBusContainer.java

Fix for FMP facade conflict.

2014-04-29 01:44:13 -05:00

ICableBusContainer.java

Fix Block Cable Painting Support.

2014-03-26 22:27:14 -05:00

NullCableBusContainer.java

Fix Block Cable Painting Support.

2014-03-26 22:27:14 -05:00

PartBasicState.java

Added Waila Integration.

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

PartPlacement.java

Network tool can now lock Storage/Conversion Monitors.

2014-05-03 02:51:56 -05:00