AlgorithmX2 3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ... Conflicts: core/localization/GuiText.java core/sync/AppEngPacketHandlerBase.java		2014-05-03 14:12:19 -05:00
..
crafting	Added Basic Restrictions on slots in MAC.	2014-04-24 20:55:29 -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	Sided Inventories now properly observe their own rotation.	2014-03-13 21:59:37 -05:00
inventory	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-04-17 22:39:59 -05:00
networking	Fix for FMP facade conflict.	2014-04-29 01:44:13 -05:00
powersink	Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup.	2014-04-06 01:55:24 -05:00
qnb	Sided Inventories now properly observe their own rotation.	2014-03-13 21:59:37 -05:00
spatial	Sided Inventories now properly observe their own rotation.	2014-03-13 21:59:37 -05:00
storage	Allow security hand shakes for monitorables.	2014-04-17 22:33:48 -05:00
AEBaseInvTile.java	Added Meteorite Spawn Distance Setting.	2014-03-15 01:58:21 -05:00
AEBaseTile.java	Added Immibis Microblock Support.	2014-03-22 16:51:37 -05:00