AlgorithmX2 1632d2d72e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ... Conflicts: items/tools/powered/ToolMassCannon.java		2014-06-16 00:51:51 -05:00
..
powered	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-06-16 00:51:51 -05:00
quartz	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
ToolBiometricCard.java	Add better custom security features.	2014-05-12 23:15:46 -05:00
ToolMemoryCard.java	Clear Memory Card When Shift Clicking on a non-machine / air.	2014-05-25 18:32:16 -05:00
ToolNetworkTool.java	Network tool can now lock Storage/Conversion Monitors.	2014-05-03 02:51:56 -05:00