Merge branch 'MultiMC:develop' into develop

Merge pull request #5380 from TacoGS/hotfix/ftba-path
HOTFIX: Fixing FTB app change of settings location
2025-10-03 16:51:30 +00:00 · 2024-03-29 13:26:54 -05:00 · 2024-03-28 09:50:45 +01:00 · 2024-03-27 22:36:27 -03:00
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");
 }
Author	SHA1	Message	Date
Neptune	e17a648c2b	Merge branch 'MultiMC:develop' into develop	2024-03-29 13:26:54 -05:00
Petr Mrázek	d4247bf3ae	Merge pull request #5380 from TacoGS/hotfix/ftba-path HOTFIX: Fixing FTB app change of settings location	2024-03-28 09:50:45 +01:00
TacoGS	07811bddd7	HOTFIX: Fixing FTB app change of settings location	2024-03-27 22:36:27 -03:00