diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-18 23:48:02 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-18 23:48:02 +0300 |
commit | 477b72ad33c29de097585ed415e1940cc25e2b34 (patch) | |
tree | e67b296ecbfdca5a0b5a1cec1062f02add0afd58 /launcher/Application.cpp | |
parent | 5162203c7d31ad58fbd8eac838f48466151af389 (diff) | |
parent | 3728cbb62abf1027f6d7daaa7b3c08f15e1e8c79 (diff) | |
download | PrismLauncher-477b72ad33c29de097585ed415e1940cc25e2b34.tar.gz PrismLauncher-477b72ad33c29de097585ed415e1940cc25e2b34.tar.bz2 PrismLauncher-477b72ad33c29de097585ed415e1940cc25e2b34.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
Diffstat (limited to 'launcher/Application.cpp')
-rw-r--r-- | launcher/Application.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index e6070006..d6c135de 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); |