aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-07-19 12:26:12 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-07-19 12:26:12 +0300
commitf046bd7d500c16f530db48f9da5b0809a02b7519 (patch)
treee87c08a1042566236b64cebed8dde9728f49046f /launcher/Application.cpp
parentec32618e1158beba1cf5b4c91c3835a233eceeeb (diff)
parent593f45298614843c14acb11994320f90a474c750 (diff)
downloadPrismLauncher-f046bd7d500c16f530db48f9da5b0809a02b7519.tar.gz
PrismLauncher-f046bd7d500c16f530db48f9da5b0809a02b7519.tar.bz2
PrismLauncher-f046bd7d500c16f530db48f9da5b0809a02b7519.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
Diffstat (limited to 'launcher/Application.cpp')
-rw-r--r--launcher/Application.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 814741dd..aeea90f1 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -6,9 +6,10 @@
* Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
* Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
- * Copyright (C) 2022 Tayou <tayou@gmx.net>
+ * Copyright (C) 2022 Tayou <git@tayou.org>
* Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
* Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ * 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
@@ -475,6 +476,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT;
qDebug() << "Version : " << BuildConfig.printableVersionString();
+ qDebug() << "Platform : " << BuildConfig.BUILD_PLATFORM;
qDebug() << "Git commit : " << BuildConfig.GIT_COMMIT;
qDebug() << "Git refspec : " << BuildConfig.GIT_REFSPEC;
if (adjustedBy.size())
@@ -609,6 +611,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
m_settings->registerSetting("IgnoreJavaCompatibility", false);
m_settings->registerSetting("IgnoreJavaWizard", false);
+ // Mod loader settings
+ m_settings->registerSetting("DisableQuiltBeacon", false);
+
// Native library workarounds
m_settings->registerSetting("UseNativeOpenAL", false);
m_settings->registerSetting("UseNativeGLFW", false);