diff options
| author | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
| commit | c4f4e9e620ee4a7094542190bc18cc167d00a7ff (patch) | |
| tree | ddb23a5782c2388eb59c02d72c0478c94dbdf6f9 /launcher/InstanceImportTask.cpp | |
| parent | 40a9828fbab0e9a8b7f070714bdd87d3f279e18c (diff) | |
| parent | f2b850ad200b1b871402c4d4bb2676f1e1288d3d (diff) | |
| download | PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.gz PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.bz2 PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.zip | |
merge upstream and resolve conflicts
Diffstat (limited to 'launcher/InstanceImportTask.cpp')
| -rw-r--r-- | launcher/InstanceImportTask.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index ec378538..6dd615c7 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -261,8 +261,6 @@ void InstanceImportTask::processFlame() QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg"); auto instanceSettings = std::make_shared<INISettingsObject>(configPath); - instanceSettings->registerSetting("InstanceType", "Legacy"); - instanceSettings->set("InstanceType", "OneSix"); MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); auto mcVersion = pack.minecraft.version; // Hack to correct some 'special sauce'... @@ -422,7 +420,6 @@ void InstanceImportTask::processMultiMC() { QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg"); auto instanceSettings = std::make_shared<INISettingsObject>(configPath); - instanceSettings->registerSetting("InstanceType", "Legacy"); NullInstance instance(m_globalSettings, instanceSettings, m_stagingPath); |