aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/technic
diff options
context:
space:
mode:
authorAaron Sonin <10217842+byteduck@users.noreply.github.com>2023-01-12 20:11:46 -0800
committerGitHub <noreply@github.com>2023-01-12 20:11:46 -0800
commitb2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7 (patch)
tree80773415691e538d437bc03c42f73a8abd01f126 /launcher/modplatform/technic
parent160dd09fc2788fea17c8e9e332c2877586640971 (diff)
parent5e89ba70797df863c7eeae9b147080e7dbdf6d3b (diff)
downloadPrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.tar.gz
PrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.tar.bz2
PrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.zip
Merge branch 'PrismLauncher:develop' into instance-accounts
Diffstat (limited to 'launcher/modplatform/technic')
-rw-r--r--launcher/modplatform/technic/TechnicPackProcessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp
index 95feb4b2..df713a72 100644
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@@ -172,7 +172,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
auto libraryObject = Json::ensureObject(library, {}, "");
auto libraryName = Json::ensureString(libraryObject, "name", "", "");
- if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))
+ if ((libraryName.startsWith("net.minecraftforge:forge:") || libraryName.startsWith("net.minecraftforge:fmlloader:")) && libraryName.contains('-'))
{
QString libraryVersion = libraryName.section(':', 2);
if (!libraryVersion.startsWith("1.7.10-"))