Merge branch 'develop' into feature/java-downloader

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/ui/pages/global/JavaPage.h

@@ -76,6 +76,8 @@ public:
     bool apply() override;
     void retranslate() override;
 
+    void updateThresholds();
+
 private:
     void applySettings();
     void loadSettings();
@@ -86,6 +88,7 @@ slots:
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
     void on_javaDownloadBtn_clicked();
+    void on_maxMemSpinBox_valueChanged(int i);
     void checkerFinished();
 
 private: