AlgorithmX2 25a588f303 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-13 19:25:07 -05:00

..

powered

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -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

Memory Card can now be used on most Blocks/Parts to save/load settings.

2014-02-19 23:18:49 -06:00

ToolNetworkTool.java

Network tool can now lock Storage/Conversion Monitors.

2014-05-03 02:51:56 -05:00