Merge pull request #3562 from kb-1000/technic-fix-1710-forge

Fix up 1.7.10 forge versions for Technic platform import by removing -1.7.10 suffix

1 files changed, 10 insertions, 1 deletions

diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
index 4a8191eb..dcf2c267 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.cpp
+++ b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
@@ -176,7 +176,16 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
 
             if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))
             {
-                components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
+                QString libraryVersion = libraryName.section(':', 2);
+                if (!libraryVersion.startsWith("1.7.10-"))
+                {
+                    components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
+                }
+                else
+                {
+                    // 1.7.10 versions sometimes look like 1.7.10-10.13.4.1614-1.7.10, this filters out the 10.13.4.1614 part
+                    components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1, 1));
+                }
             }
             else if (libraryName.startsWith("net.minecraftforge:minecraftforge:"))
             {