diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 12:50:45 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 12:50:45 +0300 |
commit | 6c4cf085e028a76dd6c0fb4d9649783b3d97aefd (patch) | |
tree | 859e8a0a8a5fb44fc58c1c18130bad6b9c723e46 /launcher/minecraft | |
parent | 87155e346c33288fccb68c3b9029a11b658395b2 (diff) | |
parent | b51f1f1d41a6153c37b1d61a04df8ece5004cc27 (diff) | |
download | PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.tar.gz PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.tar.bz2 PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/minecraft')
-rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index f8ed5214..aab930de 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -148,7 +148,7 @@ void MinecraftInstance::loadSpecificSettings() m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), javaOrLocation); // special! - m_settings->registerPassthrough(global_settings->getSetting("JavaTimestamp"), javaOrLocation); + m_settings->registerPassthrough(global_settings->getSetting("JavaSignature"), javaOrLocation); m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), javaOrLocation); m_settings->registerPassthrough(global_settings->getSetting("JavaRealArchitecture"), javaOrLocation); m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation); |