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

Conflicts:
	items/materials/MaterialType.java
	util/Platform.java

2014-05-06 20:45:38 -05:00

..

automation

Annihilation Plane and Formation Plane no update their renders properly.

2014-05-03 14:25:37 -05:00

misc

Storage Buses no longer error on load.

2014-05-03 23:15:26 -05:00

networking

Remove Meta values from Config.

2014-05-06 00:16:29 -05:00

p2p

Updated RF Api ( should work for old api too - at least temporary ).

2014-05-06 18:09:31 -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

One Last fix for BC Facdes :(

2014-05-04 19:39:29 -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

BC Facades work again.

2014-05-04 14:54:07 -05:00