Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 Conflicts: core/localization/GuiText.java |
||
---|---|---|
.. | ||
abstraction | ||
modules | ||
BaseModule.java | ||
IIntegrationModule.java | ||
IntegrationNode.java | ||
IntegrationRegistry.java | ||
IntegrationSide.java | ||
IntegrationStage.java |