Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-08-23 08:29:43 +03:00
commit 575cdb043b
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
97 changed files with 3260 additions and 804 deletions

View file

@ -407,6 +407,11 @@ void VersionPage::on_actionChange_version_triggered()
bool important = false;
if (uid == "net.minecraft") {
important = true;
if (APPLICATION->settings()->get("AutomaticJavaSwitch").toBool() && m_inst->settings()->get("AutomaticJava").toBool() &&
m_inst->settings()->get("OverrideJavaLocation").toBool()) {
m_inst->settings()->set("OverrideJavaLocation", false);
m_inst->settings()->set("JavaPath", "");
}
}
m_profile->setComponentVersion(uid, vselect.selectedVersion()->descriptor(), important);
m_profile->resolve(Net::Mode::Online);