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

Conflicts:
	items/tools/powered/ToolMassCannon.java

2014-06-16 00:51:51 -05:00

..

implementations

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

2014-06-16 00:51:51 -05:00

IAECluster.java

AE2 First Commit, the dawn of 1.7 hast arrived.

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

IAEMultiBlock.java

Multi-block clean up should be cleaner now.

2014-06-13 14:39:36 -05:00

MBCalculator.java

Ported to 1.7

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