Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 Conflicts: core/localization/GuiText.java |
||
---|---|---|
.. | ||
inv | ||
item | ||
iterators | ||
prioitylist | ||
ConfigManager.java | ||
IConfigManagerHost.java | ||
InventoryAdaptor.java | ||
InWorldToolOperationResult.java | ||
ItemSorters.java | ||
LookDirection.java | ||
Platform.java | ||
ReadOnlyCollection.java | ||
SettingsFrom.java | ||
SortedList.java |