652d2e6018
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 Conflicts: core/localization/GuiText.java |
||
---|---|---|
.. | ||
api | ||
crash | ||
features | ||
localization | ||
settings | ||
sync | ||
AEConfig.java | ||
AELog.java | ||
Api.java | ||
AppEng.java | ||
CommonHelper.java | ||
CreativeTab.java | ||
CreativeTabFacade.java | ||
FacadeConfig.java | ||
Registration.java | ||
WorldSettings.java |