Merge pull request #590 from DioEgizio/fix-qmj-over-fmj

fix(quilt) always prefer qmj over fmj
This commit is contained in:
timoreo22 2022-05-18 19:18:18 +02:00 committed by GitHub
commit b2878dca1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -430,19 +430,6 @@ void LocalModParseTask::processAsZip()
zip.close();
return;
}
else if (zip.setCurrentFile("fabric.mod.json"))
{
if (!file.open(QIODevice::ReadOnly))
{
zip.close();
return;
}
m_result->details = ReadFabricModInfo(file.readAll());
file.close();
zip.close();
return;
}
else if (zip.setCurrentFile("quilt.mod.json"))
{
if (!file.open(QIODevice::ReadOnly))
@ -456,6 +443,19 @@ void LocalModParseTask::processAsZip()
zip.close();
return;
}
else if (zip.setCurrentFile("fabric.mod.json"))
{
if (!file.open(QIODevice::ReadOnly))
{
zip.close();
return;
}
m_result->details = ReadFabricModInfo(file.readAll());
file.close();
zip.close();
return;
}
else if (zip.setCurrentFile("forgeversion.properties"))
{
if (!file.open(QIODevice::ReadOnly))