From 7dc59bc4d4f44edf382d80af1ebad3d2448bdc5c Mon Sep 17 00:00:00 2001 From: Charlie Date: Thu, 23 Oct 2025 09:00:41 +1100 Subject: [PATCH] Revert "fix: prioritize .ftbapp/version.json in FTB App import" Accidentally put this commit in my branch This reverts commit bd49dc4e7b6b85cc160bd58a78a9474a898b995b. --- launcher/modplatform/import_ftb/PackHelpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp index 22d1242e9..089b5fff2 100644 --- a/launcher/modplatform/import_ftb/PackHelpers.cpp +++ b/launcher/modplatform/import_ftb/PackHelpers.cpp @@ -79,9 +79,9 @@ Modpack parseDirectory(QString path) return {}; } - auto versionsFile = QFileInfo(FS::PathCombine(path, ".ftbapp", "version.json")); + auto versionsFile = QFileInfo(FS::PathCombine(path, "version.json")); if (!versionsFile.exists() || !versionsFile.isFile()) { - versionsFile = QFileInfo(FS::PathCombine(path, "version.json")); + versionsFile = QFileInfo(FS::PathCombine(path, ".ftbapp", "version.json")); } if (!versionsFile.exists() || !versionsFile.isFile()) { return {};