Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop

2 files changed, 9 insertions, 1 deletions

diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp
index 4a1bbef9..118bdd15 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.cpp
+++ b/launcher/modplatform/import_ftb/PackHelpers.cpp
@@ -59,7 +59,11 @@ Modpack parseDirectory(QString path)
             auto obj = Json::requireObject(target, "target");
             auto name = Json::requireString(obj, "name", "name");
             auto version = Json::requireString(obj, "version", "version");
-            if (name == "forge") {
+            if (name == "neoforge") {
+                modpack.loaderType = ResourceAPI::NeoForge;
+                modpack.version = version;
+                break;
+            } else if (name == "forge") {
                 modpack.loaderType = ResourceAPI::Forge;
                 modpack.version = version;
                 break;
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index b5e424d1..9e4decb0 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -68,6 +68,10 @@ void PackInstallTask::copySettings()
     auto modloader = m_pack.loaderType;
     if (modloader.has_value())
         switch (modloader.value()) {
+            case ResourceAPI::NeoForge: {
+                components->setComponentVersion("net.neoforged", m_pack.version, true);
+                break;
+            }
             case ResourceAPI::Forge: {
                 components->setComponentVersion("net.minecraftforge", m_pack.version, true);
                 break;