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/minecraft/MinecraftInstance.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/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 7327f9d5..6db12c42 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -124,18 +124,7 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO m_settings->registerSetting("JoinServerOnLaunch", false); m_settings->registerSetting("JoinServerOnLaunchAddress", ""); - // DEPRECATED: Read what versions the user configuration thinks should be used - m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, ""); - m_settings->registerSetting("LWJGLVersion", ""); - m_settings->registerSetting("ForgeVersion", ""); - m_settings->registerSetting("LiteloaderVersion", ""); - m_components.reset(new PackProfile(this)); - m_components->setOldConfigVersion("net.minecraft", m_settings->get("IntendedVersion").toString()); - auto setting = m_settings->getSetting("LWJGLVersion"); - m_components->setOldConfigVersion("org.lwjgl", m_settings->get("LWJGLVersion").toString()); - m_components->setOldConfigVersion("net.minecraftforge", m_settings->get("ForgeVersion").toString()); - m_components->setOldConfigVersion("com.mumfrey.liteloader", m_settings->get("LiteloaderVersion").toString()); } void MinecraftInstance::saveNow() |