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

..

BlockCableBus.java

Revert "Cable Null checks for EVERYTHING!"

2014-05-29 15:01:42 -05:00

BlockController.java

Added Meteorite Spawn Distance Setting.

2014-03-15 01:58:21 -05:00

BlockCreativeEnergyCell.java

AE2 First Commit, the dawn of 1.7 hast arrived.

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

BlockDenseEnergyCell.java

Renamed ExtraTextures and added ExtraItemTextures.

2014-05-25 20:58:44 -05:00

BlockEnergyAcceptor.java

AE2 First Commit, the dawn of 1.7 hast arrived.

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

BlockEnergyCell.java

Renamed ExtraTextures and added ExtraItemTextures.

2014-05-25 20:58:44 -05:00

BlockWireless.java

Ditch AABBPool

2014-06-04 22:59:56 -05:00