AlgorithmX2 652d2e6018 Also Cables no longer glow in the dark :P ...

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

Conflicts:
	core/localization/GuiText.java

2014-06-08 21:13:53 -05:00

..

abstraction

Add backwards support for MJ5 ( from MJ6 )

2014-05-20 22:06:37 -05:00

modules

Also Cables no longer glow in the dark :P

2014-06-08 21:13:53 -05:00

BaseModule.java

Recipe API Update.

2014-02-19 17:33:36 -06:00

IIntegrationModule.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

IntegrationNode.java

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

IntegrationRegistry.java

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

IntegrationSide.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

IntegrationStage.java

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00