3 files changed, 18 insertions, 10 deletions
diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp
index 4a1bbef9..ecf97345 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.cpp
+++ b/launcher/modplatform/import_ftb/PackHelpers.cpp
@@ -59,16 +59,20 @@ 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") {
-                modpack.loaderType = ResourceAPI::Forge;
+            if (name == "neoforge") {
+                modpack.loaderType = ModPlatform::NeoForge;
+                modpack.version = version;
+                break;
+            } else if (name == "forge") {
+                modpack.loaderType = ModPlatform::Forge;
                 modpack.version = version;
                 break;
             } else if (name == "fabric") {
-                modpack.loaderType = ResourceAPI::Fabric;
+                modpack.loaderType = ModPlatform::Fabric;
                 modpack.version = version;
                 break;
             } else if (name == "quilt") {
-                modpack.loaderType = ResourceAPI::Quilt;
+                modpack.loaderType = ModPlatform::Quilt;
                 modpack.version = version;
                 break;
             }
diff --git a/launcher/modplatform/import_ftb/PackHelpers.h b/launcher/modplatform/import_ftb/PackHelpers.h
index 8ea4f3fa..5400252b 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.h
+++ b/launcher/modplatform/import_ftb/PackHelpers.h
@@ -39,7 +39,7 @@ struct Modpack {
     // not needed for instance creation
     QVariant jvmArgs;
 
-    std::optional<ResourceAPI::ModLoaderType> loaderType;
+    std::optional<ModPlatform::ModLoaderType> loaderType;
     QString loaderVersion;
 
     QIcon icon;
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index b5e424d1..9a3b2595 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -68,21 +68,25 @@ void PackInstallTask::copySettings()
     auto modloader = m_pack.loaderType;
     if (modloader.has_value())
         switch (modloader.value()) {
-            case ResourceAPI::Forge: {
+            case ModPlatform::NeoForge: {
+                components->setComponentVersion("net.neoforged", m_pack.version, true);
+                break;
+            }
+            case ModPlatform::Forge: {
                 components->setComponentVersion("net.minecraftforge", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Fabric: {
+            case ModPlatform::Fabric: {
                 components->setComponentVersion("net.fabricmc.fabric-loader", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Quilt: {
+            case ModPlatform::Quilt: {
                 components->setComponentVersion("org.quiltmc.quilt-loader", m_pack.version, true);
                 break;
             }
-            case ResourceAPI::Cauldron:
+            case ModPlatform::Cauldron:
                 break;
-            case ResourceAPI::LiteLoader:
+            case ModPlatform::LiteLoader:
                 break;
         }
     components->saveNow();