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

Conflicts:
	items/tools/powered/ToolMassCannon.java

2014-06-04 23:05:22 -05:00

..

powersink

Hide getManager(ItemStack itemStack) from non IC2 Code.

2014-06-03 08:39:46 -05:00

ToolChargedStaff.java

Rename Configuration to AE Config

2014-02-08 23:08:27 -06:00

ToolColorApplicator.java

Added Paint Balls.

2014-05-26 03:26:37 -05:00

ToolEntropyManipulator.java

Added Paint Balls.

2014-05-26 03:26:37 -05:00

ToolMassCannon.java

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

2014-06-04 23:05:22 -05:00

ToolPortableCell.java

API Sync.

2014-03-28 13:58:21 -05:00

ToolWirelessTerminal.java

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

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