diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-10-01 14:32:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-01 14:32:58 +0200 |
commit | eab1180f68a4c994ad09c57ddf78ecd62610caa1 (patch) | |
tree | 34a75105380b19a41e6c79c86efdf0cb17bcc600 /launcher/modplatform/modrinth/ModrinthPackManifest.cpp | |
parent | e3a147f56decaa9ae40c9a9a43e48ddfa53ecc6f (diff) | |
parent | 34294383ebaeff65d2a66a49426b2141c2d840c1 (diff) | |
download | PrismLauncher-eab1180f68a4c994ad09c57ddf78ecd62610caa1.tar.gz PrismLauncher-eab1180f68a4c994ad09c57ddf78ecd62610caa1.tar.bz2 PrismLauncher-eab1180f68a4c994ad09c57ddf78ecd62610caa1.zip |
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
Diffstat (limited to 'launcher/modplatform/modrinth/ModrinthPackManifest.cpp')
-rw-r--r-- | launcher/modplatform/modrinth/ModrinthPackManifest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp index 0d07c636..a154317f 100644 --- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp @@ -111,8 +111,9 @@ void loadIndexedVersions(Modpack& pack, QJsonDocument& doc) unsortedVersions.append(file); } auto orderSortPredicate = [](const ModpackVersion& a, const ModpackVersion& b) -> bool { + bool a_better_release = a.version_type <= b.version_type; // dates are in RFC 3339 format - return a.date > b.date; + return a.date > b.date && a_better_release; }; std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate); @@ -128,6 +129,7 @@ auto loadIndexedVersion(QJsonObject& obj) -> ModpackVersion file.name = Json::requireString(obj, "name"); file.version = Json::requireString(obj, "version_number"); + file.version_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type")); file.changelog = Json::ensureString(obj, "changelog"); file.id = Json::requireString(obj, "id"); |