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

Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-13 19:25:07 -05:00

..

guisync

Swapped out Gui Sync with something a little more fancy.

2014-05-07 00:22:42 -05:00

implementations

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

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

slot

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

2014-05-13 19:25:07 -05:00

AEBaseContainer.java

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

2014-05-13 19:25:07 -05:00

ContainerNull.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

ContainerOpenContext.java

Ported to 1.7

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