Merge pull request #1678 from Trial97/release_order

fixed quilt dependencies
This commit is contained in:
Tayou 2023-10-04 10:28:45 +02:00 committed by GitHub
commit 024c474658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -94,7 +94,7 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
for (auto ver_dep : version.dependencies) { for (auto ver_dep : version.dependencies) {
if (ver_dep.type != ModPlatform::DependencyType::REQUIRED) if (ver_dep.type != ModPlatform::DependencyType::REQUIRED)
continue; continue;
ver_dep = getOverride(ver_dep, providerName);
auto isOnlyVersion = providerName == ModPlatform::ResourceProvider::MODRINTH && ver_dep.addonId.toString().isEmpty(); auto isOnlyVersion = providerName == ModPlatform::ResourceProvider::MODRINTH && ver_dep.addonId.toString().isEmpty();
if (auto dep = std::find_if(c_dependencies.begin(), c_dependencies.end(), if (auto dep = std::find_if(c_dependencies.begin(), c_dependencies.end(),
[&ver_dep, isOnlyVersion](const ModPlatform::Dependency& i) { [&ver_dep, isOnlyVersion](const ModPlatform::Dependency& i) {
@ -127,7 +127,7 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
dep != m_pack_dependencies.end()) // check loaded dependencies dep != m_pack_dependencies.end()) // check loaded dependencies
continue; continue;
c_dependencies.append(getOverride(ver_dep, providerName)); c_dependencies.append(ver_dep);
} }
return c_dependencies; return c_dependencies;
} }