Merge branch 'MultiMC:develop' into develop

2025-09-06 03:59:29 +00:00 · 2024-03-29 13:26:54 -05:00
parent f2d1f98cae d4247bf3ae
commit e17a648c2b
1 changed files with 3 additions and 0 deletions
--- a/launcher/ui/pages/modplatform/import_ftb/Model.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/Model.cpp
@@ -93,6 +93,9 @@ QString getFTBAPath() {
 #endif

 QString getFTBASettingsPath() {
+    QString returnpath = FS::PathCombine(getFTBAPath(), "storage/settings.json");
+    if (QFileInfo::exists(returnpath))
+        return returnpath;
    return FS::PathCombine(getFTBAPath(), "bin/settings.json");
 }