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

..

crafting

Crafting CPUs now appear offline unless hey have their channel requirement met.

2014-05-22 21:43:15 -05:00

events

Ported to 1.7

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

grid

Ported to 1.7

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

grindstone

Ditch AABBPool

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

inventory

Ported to 1.7

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

misc

Paint Balls.

2014-05-31 20:50:56 -05:00

networking

Ditch AABBPool

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

powersink

More intelligent funneling demand.

2014-06-03 20:33:04 -05:00

qnb

Fixed http://ae2.ae-mod.info/Tracker/0475/

2014-05-29 11:41:29 -05:00

spatial

Sided Inventories now properly observe their own rotation.

2014-03-13 21:59:37 -05:00

storage

ME Chest can have its drive removed via automation via the front slot.

2014-05-24 23:49:24 -05:00

AEBaseInvTile.java

Added Meteorite Spawn Distance Setting.

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

AEBaseTile.java

Fixed Dormant Chunk Cache.

2014-05-12 21:15:45 -05:00