aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-20 12:43:49 +0100
committerGitHub <noreply@github.com>2023-08-20 12:43:49 +0100
commit0aaea9bf5dbc49a20ad56d7856807d1bb7325411 (patch)
tree9b4514cc65502b24549517f9f3b1852001ac9ac3 /launcher/minecraft
parent232bb568da84274046d5ff6f7ee8afb91749e4c7 (diff)
parent5b4dcae7d948cd3516bc691f6e696f0951041721 (diff)
downloadPrismLauncher-0aaea9bf5dbc49a20ad56d7856807d1bb7325411.tar.gz
PrismLauncher-0aaea9bf5dbc49a20ad56d7856807d1bb7325411.tar.bz2
PrismLauncher-0aaea9bf5dbc49a20ad56d7856807d1bb7325411.zip
Merge pull request #1547 from Scrumplex/revert-quilt-beacon
Remove Quilt Beacon toggle
Diffstat (limited to 'launcher/minecraft')
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 699aaffa..0da97c14 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -4,7 +4,6 @@
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
* Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
* Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
- * Copyright (c) 2023 seth <getchoo at tuta dot io>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -185,10 +184,6 @@ void MinecraftInstance::loadSpecificSettings()
m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
- // Mod loader specific options
- auto modLoaderSettings = m_settings->registerSetting("OverrideModLoaderSettings", false);
- m_settings->registerOverride(global_settings->getSetting("DisableQuiltBeacon"), modLoaderSettings);
-
m_settings->set("InstanceType", "OneSix");
}
@@ -435,12 +430,6 @@ QStringList MinecraftInstance::extraArguments()
}
{
- const auto loaders = version->getModLoaders();
- if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool())
- list.append("-Dloader.disable_beacon=true");
- }
-
- {
QString openALPath;
QString glfwPath;