aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortimoreo22 <timo.oreo34@gmail.com>2022-05-18 19:18:18 +0200
committerGitHub <noreply@github.com>2022-05-18 19:18:18 +0200
commitb2878dca1d129dbd76c60881df22c2e65c7ae26c (patch)
treee9cbea1a7340cdfbf3c68ca95471eefd68c6ebb6
parentb883ce5c517e0d22d994ec894aa868d7e2392b06 (diff)
parent127dfadc6cd2f0c72816af86716e88c3b4af2848 (diff)
downloadPrismLauncher-b2878dca1d129dbd76c60881df22c2e65c7ae26c.tar.gz
PrismLauncher-b2878dca1d129dbd76c60881df22c2e65c7ae26c.tar.bz2
PrismLauncher-b2878dca1d129dbd76c60881df22c2e65c7ae26c.zip
Merge pull request #590 from DioEgizio/fix-qmj-over-fmj
fix(quilt) always prefer qmj over fmj
-rw-r--r--launcher/minecraft/mod/LocalModParseTask.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp
index 631c3abb..a7bec5ae 100644
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
@@ -430,7 +430,7 @@ void LocalModParseTask::processAsZip()
zip.close();
return;
}
- else if (zip.setCurrentFile("fabric.mod.json"))
+ else if (zip.setCurrentFile("quilt.mod.json"))
{
if (!file.open(QIODevice::ReadOnly))
{
@@ -438,12 +438,12 @@ void LocalModParseTask::processAsZip()
return;
}
- m_result->details = ReadFabricModInfo(file.readAll());
+ m_result->details = ReadQuiltModInfo(file.readAll());
file.close();
zip.close();
return;
}
- else if (zip.setCurrentFile("quilt.mod.json"))
+ else if (zip.setCurrentFile("fabric.mod.json"))
{
if (!file.open(QIODevice::ReadOnly))
{
@@ -451,7 +451,7 @@ void LocalModParseTask::processAsZip()
return;
}
- m_result->details = ReadQuiltModInfo(file.readAll());
+ m_result->details = ReadFabricModInfo(file.readAll());
file.close();
zip.close();
return;