diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-07-24 09:01:37 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-09-09 19:19:05 +0200 |
| commit | 13628e7a8260b9407b0d44069f5bc1ecab585f35 (patch) | |
| tree | 162a0d8b597154c1a00c649d44b3bf8fd1e10d2b /api/logic/FolderInstanceProvider.cpp | |
| parent | b29382c748353856053f07b4756fa98f854244e1 (diff) | |
| download | MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.gz MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.lz MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.tar.xz MultiMC-13628e7a8260b9407b0d44069f5bc1ecab585f35.zip | |
NOISSUE merging of strategy into profile, onesix into minecraft
Diffstat (limited to 'api/logic/FolderInstanceProvider.cpp')
| -rw-r--r-- | api/logic/FolderInstanceProvider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/FolderInstanceProvider.cpp b/api/logic/FolderInstanceProvider.cpp index 414cf479..a0fbd46a 100644 --- a/api/logic/FolderInstanceProvider.cpp +++ b/api/logic/FolderInstanceProvider.cpp @@ -1,7 +1,7 @@ #include "FolderInstanceProvider.h" #include "settings/INISettingsObject.h" #include "FileSystem.h" -#include "minecraft/onesix/OneSixInstance.h" +#include "minecraft/MinecraftInstance.h" #include "NullInstance.h" #include <QDir> @@ -88,7 +88,7 @@ InstancePtr FolderInstanceProvider::loadInstance(const InstanceId& id) if (inst_type == "OneSix" || inst_type == "Nostalgia") { - inst.reset(new OneSixInstance(m_globalSettings, instanceSettings, instanceRoot)); + inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); } else { |