External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-26 10:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from MultiMC/develop

Browse Source 
Updates from MultiMC5
This commit is contained in:
Zakhar Afonin
2020-10-10 14:29:07 +03:00
committed by GitHub
parent 9f137943fa 5180536cc3
commit ae8cb60f3e
34 changed files with 1378 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/logic/minecraft/MinecraftInstance.cpp
View File

@@ -100,6 +100,11 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
m_settings->registerOverride(globalSettings->getSetting("MCLaunchMethod"), launchMethodOverride);
// Native library workarounds
auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
// DEPRECATED: Read what versions the user configuration thinks should be used
m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
m_settings->registerSetting("LWJGLVersion", "");