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	Renamed ExtraTextures and added ExtraItemTextures.	2014-05-25 20:58:44 -05:00
grindstone	Ported to 1.7	2014-02-08 19:34:52 -06:00
misc	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-06-04 23:05:22 -05:00
networking	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-06-04 23:05:22 -05:00
qnb	Ditch AABBPool	2014-06-04 22:59:56 -05:00
solids	Update API for metadata flag.	2014-05-11 11:24:46 -05:00
spatial	Ditch AABBPool	2014-06-04 22:59:56 -05:00
storage	Ditch AABBPool	2014-06-04 22:59:56 -05:00
AEBaseBlock.java	Clear Memory Card When Shift Clicking on a non-machine / air.	2014-05-25 18:32:16 -05:00
AEBaseItemBlock.java	Don't discriminate against blocks with custom rotation.	2014-04-09 20:02:34 -05:00
AEBaseItemBlockChargeable.java	Ported to 1.7	2014-02-08 19:34:52 -06:00
AEDecorativeBlock.java	Added Rotatable Blocks integration.	2014-04-03 23:12:35 -05:00