diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index d88e47ce5..6fc8d6d17 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -980,6 +980,20 @@ void Application::performMainStartupAction()
return;
}
}
+ {
+ bool shouldFetch = m_settings->get("FlameKeyShouldBeFetchedOnStartup").toBool();
+ if (!BuildConfig.FLAME_API_KEY_API_URL.isEmpty() && shouldFetch && !(capabilities() & Capability::SupportsFlame))
+ {
+ // don't ask, just fetch
+ QString apiKey = GuiUtil::fetchFlameKey();
+ if (!apiKey.isEmpty())
+ {
+ m_settings->set("FlameKeyOverride", apiKey);
+ updateCapabilities();
+ }
+ m_settings->set("FlameKeyShouldBeFetchedOnStartup", false);
+ }
+ }
if (!m_mainWindow) {
// normal main window
showMainWindow(false);
diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.cpp b/launcher/minecraft/auth/steps/YggdrasilStep.cpp
index 0c201a1fe..bfc894b56 100644
--- a/launcher/minecraft/auth/steps/YggdrasilStep.cpp
+++ b/launcher/minecraft/auth/steps/YggdrasilStep.cpp
@@ -30,7 +30,7 @@ void YggdrasilStep::perform()
if (m_password.size()) {
m_yggdrasil->login(m_password, "https://authserver.mojang.com/");
} else {
- m_yggdrasil->refresh();
+ m_yggdrasil->refresh("https://authserver.mojang.com/");
}
}
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 67f6abe8d..c736911bf 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -82,7 +82,7 @@ QString getCreditsHtml()
stream << "
\n";
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
- stream << "
Sefa Eyeoglu (Scrumplex) %1
\n").arg(getWebsite("https://scrumplex.net")); stream << QString("d-513 %1
\n").arg(getGitHub("d-513")); stream << QString("txtsd %1
\n").arg(getWebsite("https://ihavea.quest")); diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index abd607c61..3f51ceada 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -190,7 +190,6 @@ void AccountListPage::on_actionAddElyby_triggered() } } } -} void AccountListPage::on_actionRemove_triggered() { diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp index 0bcac100c..5f96ec8e4 100644 --- a/launcher/ui/themes/ThemeManager.cpp +++ b/launcher/ui/themes/ThemeManager.cpp @@ -271,7 +271,8 @@ void ThemeManager::initializeCatPacks() QList