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

Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java

2014-05-22 18:49:02 -05:00

..

automation

Annihilation Plane and Formation Plane no update their renders properly.

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

misc

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

2014-05-22 18:49:02 -05:00

networking

Removed Alpha Migration.

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

p2p

Add backwards support for MJ5 ( from MJ6 )

2014-05-20 22:06:37 -05:00

reporting

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

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

AEBasePart.java

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00

BusCollisionHelper.java

Ported to 1.7

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

CableBusContainer.java

Removed Alpha Migration.

2014-05-15 21:18:30 -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