Merge branch 'develop' into launcher-log-page

2025-06-06 21:36:03 +08:00
parent 25907ea8c6 f17e443b12
commit 836c558c6c
42 changed files with 332 additions and 120 deletions
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -796,6 +796,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
        // The cat
        m_settings->registerSetting("TheCat", false);
        m_settings->registerSetting("CatOpacity", 100);
+        m_settings->registerSetting("CatFit", "fit");

        m_settings->registerSetting("StatusBarVisible", true);