Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks

This commit is contained in:
Trial97 2023-07-02 13:14:19 +03:00
commit 7ac2a23bc8
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
118 changed files with 1685 additions and 2530 deletions

View file

@ -594,7 +594,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
// Java Settings
m_settings->registerSetting("JavaPath", "");
m_settings->registerSetting("JavaTimestamp", 0);
m_settings->registerSetting("JavaSignature", "");
m_settings->registerSetting("JavaArchitecture", "");
m_settings->registerSetting("JavaRealArchitecture", "");
m_settings->registerSetting("JavaVersion", "");