From c15603406907383c58786cb1dc235ac79c7f9626 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 26 May 2023 13:50:22 -0700
Subject: [PATCH 01/35] feat: add verion_type / release_type to IndexedVersion

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/ModIndex.cpp             | 50 +++++++++++++++++++
 launcher/modplatform/ModIndex.h               | 24 +++++++++
 launcher/modplatform/flame/FlameAPI.cpp       |  5 +-
 launcher/modplatform/flame/FlameModIndex.cpp  |  8 ++-
 .../modrinth/ModrinthPackIndex.cpp            |  9 +++-
 5 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 6a507caf4..7fdca3b37 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -24,6 +24,56 @@
 
 namespace ModPlatform {
 
+static const QMap<QString, IndexedVersionType::Enum> s_indexed_version_type_names = {
+    {"release", IndexedVersionType::Enum::Release},
+    {"beta", IndexedVersionType::Enum::Beta},
+    {"alpha", IndexedVersionType::Enum::Alpha}
+};
+
+IndexedVersionType::IndexedVersionType(const QString& type): IndexedVersionType(enumFromString(type))
+{}
+
+IndexedVersionType::IndexedVersionType(int type)
+{
+    m_type = static_cast<IndexedVersionType::Enum>(type);
+}
+
+IndexedVersionType::IndexedVersionType(const IndexedVersionType::Enum& type)
+{
+    m_type = type;
+}
+
+IndexedVersionType::IndexedVersionType(const IndexedVersionType& other)
+{
+    m_type = other.m_type;
+}
+
+const QString IndexedVersionType::toString (const IndexedVersionType::Enum& type)
+{
+    switch (type) {
+        case IndexedVersionType::Enum::Release:
+            return "release";
+        case IndexedVersionType::Enum::Beta:
+            return "beta";
+        case IndexedVersionType::Enum::Alpha:
+            return "alpha";
+        case IndexedVersionType::Enum::UNKNOWN:
+        default:
+            return "unknown";
+
+    }
+}
+
+const IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
+{
+    auto found = s_indexed_version_type_names.constFind(type);
+    if (found != s_indexed_version_type_names.constEnd()) {
+        return *found;
+    } else {
+        return IndexedVersionType::Enum::UNKNOWN;
+    }
+}
+
 auto ProviderCapabilities::name(ResourceProvider p) -> const char*
 {
     switch (p) {
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 40f1efc4e..f15b296af 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -23,6 +23,7 @@
 #include <QString>
 #include <QVariant>
 #include <QVector>
+#include <optional>
 
 class QIODevice;
 
@@ -51,11 +52,34 @@ struct DonationData {
     QString url;
 };
 
+struct IndexedVersionType {
+    enum class Enum {
+        Release = 1,
+        Beta,
+        Alpha,
+        UNKNOWN
+    };
+    IndexedVersionType(const QString& type);
+    IndexedVersionType(int type);
+    IndexedVersionType(const IndexedVersionType::Enum& type);
+    IndexedVersionType(const IndexedVersionType& type);
+    static const QString toString (const IndexedVersionType::Enum& type);
+    static const IndexedVersionType::Enum enumFromString(const QString& type);
+    bool isValid() const {return m_type != IndexedVersionType::Enum::UNKNOWN; }
+    bool operator==(const IndexedVersionType& other) const { return m_type == other.m_type; }
+    bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
+    bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }
+    bool operator<(const IndexedVersionType::Enum& type) const { return m_type < type; }
+
+    IndexedVersionType::Enum m_type;
+};
+
 struct IndexedVersion {
     QVariant addonId;
     QVariant fileId;
     QString version;
     QString version_number = {};
+    std::optional<IndexedVersionType> verison_type = {};
     QStringList mcVersion;
     QString downloadUrl;
     QString date;
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 5ef9a4090..0f26efefe 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -144,7 +144,10 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
                 auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                if(file_tmp.date > ver_tmp.date) {
+                bool better_release = true;
+                if (file_tmp.verison_type.has_value() && ver_tmp.verison_type.has_value())
+                    better_release = file_tmp.verison_type.value() < ver_tmp.verison_type.value();
+                if(file_tmp.date > ver_tmp.date && better_release) {
                     ver_tmp = file_tmp;
                     latest_file_obj = file_obj;
                 }
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 7498e8302..5866cfbd4 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -94,8 +94,11 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
+        bool a_better_release = true;
+        if (a.verison_type.has_value() && b.verison_type.has_value())
+            a_better_release = a.verison_type.value() < b.verison_type.value();
         // 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);
     pack.versions = unsortedVersions;
@@ -123,6 +126,9 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     file.version = Json::requireString(obj, "displayName");
     file.downloadUrl = Json::ensureString(obj, "downloadUrl");
     file.fileName = Json::requireString(obj, "fileName");
+    auto version_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
+    if (version_type.isValid())
+        file.verison_type = version_type;
 
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 7ade131e4..c87fa3029 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -109,8 +109,11 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
+        bool a_better_release = true;
+        if (a.verison_type.has_value() && b.verison_type.has_value())
+            a_better_release = a.verison_type.value() < b.verison_type.value();
         // 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);
     pack.versions = unsortedVersions;
@@ -138,6 +141,10 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
     }
     file.version = Json::requireString(obj, "name");
     file.version_number = Json::requireString(obj, "version_number");
+    auto verison_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
+    if (verison_type.isValid())
+        file.verison_type = verison_type;
+
     file.changelog = Json::requireString(obj, "changelog");
 
     auto files = Json::requireArray(obj, "files");

From cf4df19986fe53357ef04b2a4407f69a2f4fa196 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 26 May 2023 16:23:43 -0700
Subject: [PATCH 02/35] feat: display release type

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/CheckUpdateTask.h        | 28 +++++++++++++++----
 launcher/modplatform/ModIndex.cpp             | 14 +++++++++-
 launcher/modplatform/ModIndex.h               |  4 ++-
 launcher/modplatform/flame/FlameAPI.cpp       |  4 +--
 .../modplatform/flame/FlameCheckUpdate.cpp    |  2 +-
 launcher/modplatform/flame/FlameModIndex.cpp  |  8 ++----
 launcher/modplatform/flame/FlamePackIndex.cpp |  1 +
 launcher/modplatform/flame/FlamePackIndex.h   |  3 ++
 .../modrinth/ModrinthCheckUpdate.cpp          |  4 +--
 .../modrinth/ModrinthPackIndex.cpp            |  8 ++----
 .../modrinth/ModrinthPackManifest.cpp         |  4 ++-
 .../modrinth/ModrinthPackManifest.h           |  3 ++
 launcher/ui/dialogs/ModUpdateDialog.cpp       |  5 ++++
 launcher/ui/pages/modplatform/ModPage.cpp     |  6 ++--
 .../ui/pages/modplatform/ResourcePage.cpp     |  4 +--
 .../ui/pages/modplatform/flame/FlamePage.cpp  |  3 +-
 .../modplatform/modrinth/ModrinthPage.cpp     |  6 ++--
 17 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h
index f7582b8f1..fbafedd77 100644
--- a/launcher/modplatform/CheckUpdateTask.h
+++ b/launcher/modplatform/CheckUpdateTask.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "minecraft/mod/Mod.h"
-#include "modplatform/ResourceAPI.h"
 #include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
 #include "tasks/Task.h"
 
 class ResourceDownloadTask;
@@ -12,21 +12,39 @@ class CheckUpdateTask : public Task {
     Q_OBJECT
 
    public:
-    CheckUpdateTask(QList<Mod*>& mods, std::list<Version>& mcVersions, std::optional<ResourceAPI::ModLoaderTypes> loaders, std::shared_ptr<ModFolderModel> mods_folder)
-        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
+    CheckUpdateTask(QList<Mod*>& mods,
+                    std::list<Version>& mcVersions,
+                    std::optional<ResourceAPI::ModLoaderTypes> loaders,
+                    std::shared_ptr<ModFolderModel> mods_folder)
+        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder){};
 
     struct UpdatableMod {
         QString name;
         QString old_hash;
         QString old_version;
         QString new_version;
+        std::optional<ModPlatform::IndexedVersionType> new_verison_type;
         QString changelog;
         ModPlatform::ResourceProvider provider;
         shared_qobject_ptr<ResourceDownloadTask> download;
 
        public:
-        UpdatableMod(QString name, QString old_h, QString old_v, QString new_v, QString changelog, ModPlatform::ResourceProvider p, shared_qobject_ptr<ResourceDownloadTask> t)
-            : name(name), old_hash(old_h), old_version(old_v), new_version(new_v), changelog(changelog), provider(p), download(t)
+        UpdatableMod(QString name,
+                     QString old_h,
+                     QString old_v,
+                     QString new_v,
+                     std::optional<ModPlatform::IndexedVersionType> new_v_type,
+                     QString changelog,
+                     ModPlatform::ResourceProvider p,
+                     shared_qobject_ptr<ResourceDownloadTask> t)
+            : name(name)
+            , old_hash(old_h)
+            , old_version(old_v)
+            , new_version(new_v)
+            , new_verison_type(new_v_type)
+            , changelog(changelog)
+            , provider(p)
+            , download(t)
         {}
     };
 
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 7fdca3b37..607c26e61 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -35,7 +35,19 @@ IndexedVersionType::IndexedVersionType(const QString& type): IndexedVersionType(
 
 IndexedVersionType::IndexedVersionType(int type)
 {
-    m_type = static_cast<IndexedVersionType::Enum>(type);
+    switch (type) {
+        case 1:
+            m_type = IndexedVersionType::Enum::Release;
+            break;
+        case 2:
+            m_type = IndexedVersionType::Enum::Beta;
+            break;
+        case 3:
+            m_type = IndexedVersionType::Enum::Alpha;
+            break;
+        default:
+            m_type = IndexedVersionType::Enum::UNKNOWN;
+    }
 }
 
 IndexedVersionType::IndexedVersionType(const IndexedVersionType::Enum& type)
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index f15b296af..10b61b167 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -63,6 +63,7 @@ struct IndexedVersionType {
     IndexedVersionType(int type);
     IndexedVersionType(const IndexedVersionType::Enum& type);
     IndexedVersionType(const IndexedVersionType& type);
+    IndexedVersionType() : IndexedVersionType(IndexedVersionType::Enum::UNKNOWN) {}
     static const QString toString (const IndexedVersionType::Enum& type);
     static const IndexedVersionType::Enum enumFromString(const QString& type);
     bool isValid() const {return m_type != IndexedVersionType::Enum::UNKNOWN; }
@@ -70,6 +71,7 @@ struct IndexedVersionType {
     bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
     bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }
     bool operator<(const IndexedVersionType::Enum& type) const { return m_type < type; }
+    QString toString() const { return toString(m_type); }
 
     IndexedVersionType::Enum m_type;
 };
@@ -79,7 +81,7 @@ struct IndexedVersion {
     QVariant fileId;
     QString version;
     QString version_number = {};
-    std::optional<IndexedVersionType> verison_type = {};
+    IndexedVersionType verison_type;
     QStringList mcVersion;
     QString downloadUrl;
     QString date;
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 0f26efefe..ad3ab16ac 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -144,9 +144,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
                 auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                bool better_release = true;
-                if (file_tmp.verison_type.has_value() && ver_tmp.verison_type.has_value())
-                    better_release = file_tmp.verison_type.value() < ver_tmp.verison_type.value();
+                bool better_release = file_tmp.verison_type < ver_tmp.verison_type;
                 if(file_tmp.date > ver_tmp.date && better_release) {
                     ver_tmp = file_tmp;
                     latest_file_obj = file_obj;
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index 06a895027..1e8cc66d9 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -173,7 +173,7 @@ void FlameCheckUpdate::executeTask()
             }
 
             auto download_task = makeShared<ResourceDownloadTask>(pack, latest_ver, m_mods_folder);
-            m_updatable.emplace_back(pack.name, mod->metadata()->hash, old_version, latest_ver.version,
+            m_updatable.emplace_back(pack.name, mod->metadata()->hash, old_version, latest_ver.version, latest_ver.verison_type,
                                      api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
                                      ModPlatform::ResourceProvider::FLAME, download_task);
         }
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 5866cfbd4..cb7177d2e 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -94,9 +94,7 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = true;
-        if (a.verison_type.has_value() && b.verison_type.has_value())
-            a_better_release = a.verison_type.value() < b.verison_type.value();
+        bool a_better_release = a.verison_type < b.verison_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
@@ -126,9 +124,7 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     file.version = Json::requireString(obj, "displayName");
     file.downloadUrl = Json::ensureString(obj, "downloadUrl");
     file.fileName = Json::requireString(obj, "fileName");
-    auto version_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
-    if (version_type.isValid())
-        file.verison_type = version_type;
+    file.verison_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
 
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index ad48b7b6a..e643c96b0 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -90,6 +90,7 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
         // pick the latest version supported
         file.mcVersion = versionArray[0].toString();
         file.version = Json::requireString(version, "displayName");
+        file.version_type = ModPlatform::IndexedVersionType(Json::requireInteger(version, "releaseType"));
         file.downloadUrl = Json::ensureString(version, "downloadUrl");
 
         // only add if we have a download URL (third party distribution is enabled)
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index 1ca0fc0e5..0abcadb36 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -5,6 +5,8 @@
 #include <QString>
 #include <QVector>
 
+#include "modplatform/ModIndex.h"
+
 namespace Flame {
 
 struct ModpackAuthor {
@@ -16,6 +18,7 @@ struct IndexedVersion {
     int addonId;
     int fileId;
     QString version;
+    ModPlatform::IndexedVersionType version_type;
     QString mcVersion;
     QString downloadUrl;
 };
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index d1be72099..76ad70157 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -161,8 +161,8 @@ void ModrinthCheckUpdate::executeTask()
 
                     auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
 
-                    m_updatable.emplace_back(pack.name, hash, mod->version(), project_ver.version_number, project_ver.changelog,
-                                             ModPlatform::ResourceProvider::MODRINTH, download_task);
+                    m_updatable.emplace_back(pack.name, hash, mod->version(), project_ver.version_number, project_ver.verison_type,
+                                             project_ver.changelog, ModPlatform::ResourceProvider::MODRINTH, download_task);
                 }
             }
         } catch (Json::JsonException& e) {
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index c87fa3029..2e9d14575 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -109,9 +109,7 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = true;
-        if (a.verison_type.has_value() && b.verison_type.has_value())
-            a_better_release = a.verison_type.value() < b.verison_type.value();
+        bool a_better_release = a.verison_type < b.verison_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
@@ -141,9 +139,7 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
     }
     file.version = Json::requireString(obj, "name");
     file.version_number = Json::requireString(obj, "version_number");
-    auto verison_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
-    if (verison_type.isValid())
-        file.verison_type = verison_type;
+    file.verison_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
 
     file.changelog = Json::requireString(obj, "changelog");
 
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index 4dca786f0..04ed4fa23 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");
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.h b/launcher/modplatform/modrinth/ModrinthPackManifest.h
index 2973dfba2..5f8c50a1a 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.h
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.h
@@ -45,6 +45,8 @@
 #include <QUrl>
 #include <QVector>
 
+#include "modplatform/ModIndex.h"
+
 class MinecraftInstance;
 
 namespace Modrinth {
@@ -80,6 +82,7 @@ struct ModpackExtra {
 struct ModpackVersion {
     QString name;
     QString version;
+    ModPlatform::IndexedVersionType version_type;
     QString changelog;
 
     QString id;
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 8618b9240..9e010444c 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -362,6 +362,11 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     auto new_version_item = new QTreeWidgetItem(item_top);
     new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
 
+    if (info.new_verison_type.has_value()) {
+        auto new_version_type_itme = new QTreeWidgetItem(item_top);
+        new_version_type_itme->setText(0, tr("New Version Type: %1").arg(info.new_verison_type.value().toString()));
+    }
+    
     auto changelog_item = new QTreeWidgetItem(item_top);
     changelog_item->setText(0, tr("Changelog of the latest version"));
 
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index 04be43ada..e156f5009 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -137,8 +137,10 @@ void ModPage::updateVersionList()
         }
 
         // Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
-        if ((valid || m_filter->versions.empty()) && !optedOut(version))
-            m_ui->versionSelectionBox->addItem(version.version, QVariant(i));
+        if ((valid || m_filter->versions.empty()) && !optedOut(version)) {
+            auto release_type = version.verison_type.isValid() ? QString(" : %1").arg(version.verison_type.toString()) : "";
+            m_ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(i));
+        }
     }
     if (m_ui->versionSelectionBox->count() == 0) {
         m_ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index bbd465bc1..72565eccc 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -256,8 +256,8 @@ void ResourcePage::updateVersionList()
         auto& version = current_pack.versions[i];
         if (optedOut(version))
             continue;
-
-        m_ui->versionSelectionBox->addItem(current_pack.versions[i].version, QVariant(i));
+        auto release_type = current_pack.versions[i].verison_type.isValid() ? QString(" : %1").arg(current_pack.versions[i].verison_type.toString()) : "";
+        m_ui->versionSelectionBox->addItem(QString("%1%2").arg(current_pack.versions[i].version, release_type), QVariant(i));
     }
 
     if (m_ui->versionSelectionBox->count() == 0) {
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index f9ac4a789..95bb9d0f3 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -155,7 +155,8 @@ void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
             }
 
             for (auto version : current.versions) {
-                ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
+                auto release_type = version.version_type.isValid() ? QString(" : %1").arg(version.version_type.toString()) : "";
+                ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(version.downloadUrl));
             }
 
             QVariant current_updated;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 0bb11d834..725af9b0c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -201,12 +201,12 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
                 qDebug() << *response;
                 qWarning() << "Error while reading modrinth modpack version: " << e.cause();
             }
-
             for (auto version : current.versions) {
+                auto release_type = version.version_type.isValid() ? QString(" : %1").arg(version.version_type.toString()) : "";
                 if (!version.name.contains(version.version))
-                    ui->versionSelectionBox->addItem(QString("%1 — %2").arg(version.name, version.version), QVariant(version.id));
+                    ui->versionSelectionBox->addItem(QString("%1 — %2%3").arg(version.name, version.version, release_type), QVariant(version.id));
                 else
-                    ui->versionSelectionBox->addItem(version.name, QVariant(version.id));
+                    ui->versionSelectionBox->addItem(QString("%1%2").arg(version.name, release_type), QVariant(version.id));
             }
 
             QVariant current_updated;

From 832a61f88674ee1ba01d7618e1021184cc851e3a Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 26 May 2023 16:34:30 -0700
Subject: [PATCH 03/35] fix: make codeQl happy

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/ModIndex.cpp | 8 +++++++-
 launcher/modplatform/ModIndex.h   | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 607c26e61..3e1f473e9 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -60,6 +60,12 @@ IndexedVersionType::IndexedVersionType(const IndexedVersionType& other)
     m_type = other.m_type;
 }
 
+IndexedVersionType& IndexedVersionType::operator=(const IndexedVersionType& other) 
+{
+    m_type = other.m_type;
+    return *this;
+}
+
 const QString IndexedVersionType::toString (const IndexedVersionType::Enum& type)
 {
     switch (type) {
@@ -76,7 +82,7 @@ const QString IndexedVersionType::toString (const IndexedVersionType::Enum& type
     }
 }
 
-const IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
+IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
 {
     auto found = s_indexed_version_type_names.constFind(type);
     if (found != s_indexed_version_type_names.constEnd()) {
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 10b61b167..f317d29e8 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -65,8 +65,9 @@ struct IndexedVersionType {
     IndexedVersionType(const IndexedVersionType& type);
     IndexedVersionType() : IndexedVersionType(IndexedVersionType::Enum::UNKNOWN) {}
     static const QString toString (const IndexedVersionType::Enum& type);
-    static const IndexedVersionType::Enum enumFromString(const QString& type);
+    static IndexedVersionType::Enum enumFromString(const QString& type);
     bool isValid() const {return m_type != IndexedVersionType::Enum::UNKNOWN; }
+    IndexedVersionType& operator=(const IndexedVersionType& other);
     bool operator==(const IndexedVersionType& other) const { return m_type == other.m_type; }
     bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
     bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }

From 2680dba0aa74abefea58903dadad6578381101cb Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 26 May 2023 17:16:50 -0700
Subject: [PATCH 04/35] fix: use <= when compareing release types

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/ModIndex.h                        | 9 +++++++++
 launcher/modplatform/flame/FlameAPI.cpp                | 2 +-
 launcher/modplatform/flame/FlameModIndex.cpp           | 2 +-
 launcher/modplatform/modrinth/ModrinthPackIndex.cpp    | 2 +-
 launcher/modplatform/modrinth/ModrinthPackManifest.cpp | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index f317d29e8..652e21ef0 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -70,8 +70,17 @@ struct IndexedVersionType {
     IndexedVersionType& operator=(const IndexedVersionType& other);
     bool operator==(const IndexedVersionType& other) const { return m_type == other.m_type; }
     bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
+    bool operator!=(const IndexedVersionType& other) const { return m_type != other.m_type; }
+    bool operator!=(const IndexedVersionType::Enum& type) const { return m_type != type; }
     bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }
     bool operator<(const IndexedVersionType::Enum& type) const { return m_type < type; }
+    bool operator<=(const IndexedVersionType& other) const { return m_type <= other.m_type; }
+    bool operator<=(const IndexedVersionType::Enum& type) const { return m_type <= type; }
+    bool operator>(const IndexedVersionType& other) const { return m_type > other.m_type; }
+    bool operator>(const IndexedVersionType::Enum& type) const { return m_type > type; }
+    bool operator>=(const IndexedVersionType& other) const { return m_type >= other.m_type; }
+    bool operator>=(const IndexedVersionType::Enum& type) const { return m_type >= type; }
+
     QString toString() const { return toString(m_type); }
 
     IndexedVersionType::Enum m_type;
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index ad3ab16ac..b5155dd8c 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -144,7 +144,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
                 auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                bool better_release = file_tmp.verison_type < ver_tmp.verison_type;
+                bool better_release = file_tmp.verison_type <= ver_tmp.verison_type;
                 if(file_tmp.date > ver_tmp.date && better_release) {
                     ver_tmp = file_tmp;
                     latest_file_obj = file_obj;
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index cb7177d2e..389ee03b3 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -94,7 +94,7 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.verison_type < b.verison_type;
+        bool a_better_release = a.verison_type <= b.verison_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 2e9d14575..e643df677 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -109,7 +109,7 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.verison_type < b.verison_type;
+        bool a_better_release = a.verison_type <= b.verison_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index 04ed4fa23..aff29fb8c 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -111,7 +111,7 @@ 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;
+        bool a_better_release = a.version_type <= b.version_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };

From 564e394ec80fed5174a7c42edcd6801ba8c29058 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 21:48:12 +0300
Subject: [PATCH 05/35] feat:Update mods now fills missing dependencies

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/CheckUpdateTask.h        | 20 +++++--
 .../modplatform/flame/FlameCheckUpdate.cpp    | 23 +++----
 .../modrinth/ModrinthCheckUpdate.cpp          | 23 +++----
 launcher/ui/dialogs/ModUpdateDialog.cpp       | 60 +++++++++++++++++--
 4 files changed, 94 insertions(+), 32 deletions(-)

diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h
index f7582b8f1..94b16dcc9 100644
--- a/launcher/modplatform/CheckUpdateTask.h
+++ b/launcher/modplatform/CheckUpdateTask.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include "minecraft/mod/Mod.h"
-#include "modplatform/ResourceAPI.h"
+#include "minecraft/mod/tasks/GetModDependenciesTask.h"
 #include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
 #include "tasks/Task.h"
 
 class ResourceDownloadTask;
@@ -12,8 +13,11 @@ class CheckUpdateTask : public Task {
     Q_OBJECT
 
    public:
-    CheckUpdateTask(QList<Mod*>& mods, std::list<Version>& mcVersions, std::optional<ResourceAPI::ModLoaderTypes> loaders, std::shared_ptr<ModFolderModel> mods_folder)
-        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
+    CheckUpdateTask(QList<Mod*>& mods,
+                    std::list<Version>& mcVersions,
+                    std::optional<ResourceAPI::ModLoaderTypes> loaders,
+                    std::shared_ptr<ModFolderModel> mods_folder)
+        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder){};
 
     struct UpdatableMod {
         QString name;
@@ -25,12 +29,19 @@ class CheckUpdateTask : public Task {
         shared_qobject_ptr<ResourceDownloadTask> download;
 
        public:
-        UpdatableMod(QString name, QString old_h, QString old_v, QString new_v, QString changelog, ModPlatform::ResourceProvider p, shared_qobject_ptr<ResourceDownloadTask> t)
+        UpdatableMod(QString name,
+                     QString old_h,
+                     QString old_v,
+                     QString new_v,
+                     QString changelog,
+                     ModPlatform::ResourceProvider p,
+                     shared_qobject_ptr<ResourceDownloadTask> t)
             : name(name), old_hash(old_h), old_version(old_v), new_version(new_v), changelog(changelog), provider(p), download(t)
         {}
     };
 
     auto getUpdatable() -> std::vector<UpdatableMod>&& { return std::move(m_updatable); }
+    auto getDependencies() -> QList<std::shared_ptr<GetModDependenciesTask::PackDependency>>&& { return std::move(m_deps); }
 
    public slots:
     bool abort() override = 0;
@@ -48,4 +59,5 @@ class CheckUpdateTask : public Task {
     std::shared_ptr<ModFolderModel> m_mods_folder;
 
     std::vector<UpdatableMod> m_updatable;
+    QList<std::shared_ptr<GetModDependenciesTask::PackDependency>> m_deps;
 };
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index a2628e34c..dd6dd1eac 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -12,6 +12,7 @@
 
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"
+#include "minecraft/mod/tasks/GetModDependenciesTask.h"
 
 static FlameAPI api;
 
@@ -154,18 +155,17 @@ void FlameCheckUpdate::executeTask()
             continue;
         }
 
+        // Fake pack with the necessary info to pass to the download task :)
+        auto pack = std::make_shared<ModPlatform::IndexedPack>();
+        pack->name = mod->name();
+        pack->slug = mod->metadata()->slug;
+        pack->addonId = mod->metadata()->project_id;
+        pack->websiteUrl = mod->homeurl();
+        for (auto& author : mod->authors())
+            pack->authors.append({ author });
+        pack->description = mod->description();
+        pack->provider = ModPlatform::ResourceProvider::FLAME;
         if (!latest_ver.hash.isEmpty() && (mod->metadata()->hash != latest_ver.hash || mod->status() == ModStatus::NotInstalled)) {
-            // Fake pack with the necessary info to pass to the download task :)
-            auto pack = std::make_shared<ModPlatform::IndexedPack>();
-            pack->name = mod->name();
-            pack->slug = mod->metadata()->slug;
-            pack->addonId = mod->metadata()->project_id;
-            pack->websiteUrl = mod->homeurl();
-            for (auto& author : mod->authors())
-                pack->authors.append({ author });
-            pack->description = mod->description();
-            pack->provider = ModPlatform::ResourceProvider::FLAME;
-
             auto old_version = mod->version();
             if (old_version.isEmpty() && mod->status() != ModStatus::NotInstalled) {
                 auto current_ver = getFileInfo(latest_ver.addonId.toInt(), mod->metadata()->file_id.toInt());
@@ -177,6 +177,7 @@ void FlameCheckUpdate::executeTask()
                                      api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
                                      ModPlatform::ResourceProvider::FLAME, download_task);
         }
+        m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, latest_ver));
     }
 
     emitSucceeded();
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index a7c22832a..dac110226 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -145,26 +145,27 @@ void ModrinthCheckUpdate::executeTask()
                 auto mod = *mod_iter;
 
                 auto key = project_ver.hash;
+
+                // Fake pack with the necessary info to pass to the download task :)
+                auto pack = std::make_shared<ModPlatform::IndexedPack>();
+                pack->name = mod->name();
+                pack->slug = mod->metadata()->slug;
+                pack->addonId = mod->metadata()->project_id;
+                pack->websiteUrl = mod->homeurl();
+                for (auto& author : mod->authors())
+                    pack->authors.append({ author });
+                pack->description = mod->description();
+                pack->provider = ModPlatform::ResourceProvider::MODRINTH;
                 if ((key != hash && project_ver.is_preferred) || (mod->status() == ModStatus::NotInstalled)) {
                     if (mod->version() == project_ver.version_number)
                         continue;
 
-                    // Fake pack with the necessary info to pass to the download task :)
-                    auto pack = std::make_shared<ModPlatform::IndexedPack>();
-                    pack->name = mod->name();
-                    pack->slug = mod->metadata()->slug;
-                    pack->addonId = mod->metadata()->project_id;
-                    pack->websiteUrl = mod->homeurl();
-                    for (auto& author : mod->authors())
-                        pack->authors.append({ author });
-                    pack->description = mod->description();
-                    pack->provider = ModPlatform::ResourceProvider::MODRINTH;
-
                     auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
 
                     m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.changelog,
                                              ModPlatform::ResourceProvider::MODRINTH, download_task);
                 }
+                m_deps.append(std::make_shared<GetModDependenciesTask::PackDependency>(pack, project_ver));
             }
         } catch (Json::JsonException& e) {
             failed(e.cause() + " : " + e.what());
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 8618b9240..6629b1f23 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -3,6 +3,9 @@
 #include "CustomMessageBox.h"
 #include "ProgressDialog.h"
 #include "ScrollMessageBox.h"
+#include "minecraft/mod/tasks/GetModDependenciesTask.h"
+#include "modplatform/ModIndex.h"
+#include "modplatform/flame/FlameAPI.h"
 #include "ui_ReviewMessageBox.h"
 
 #include "FileSystem.h"
@@ -89,15 +92,17 @@ void ModUpdateDialog::checkCandidates()
 
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
-        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
-        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_flame_check_task);
     }
 
@@ -124,6 +129,8 @@ void ModUpdateDialog::checkCandidates()
         return;
     }
 
+    QList<std::shared_ptr<GetModDependenciesTask::PackDependency>> selectedVers;
+
     // Add found updates for Modrinth
     if (m_modrinth_check_task) {
         auto modrinth_updates = m_modrinth_check_task->getUpdatable();
@@ -133,6 +140,7 @@ void ModUpdateDialog::checkCandidates()
             appendMod(updatable);
             m_tasks.insert(updatable.name, updatable.download);
         }
+        selectedVers.append(m_modrinth_check_task->getDependencies());
     }
 
     // Add found updated for Flame
@@ -144,6 +152,7 @@ void ModUpdateDialog::checkCandidates()
             appendMod(updatable);
             m_tasks.insert(updatable.name, updatable.download);
         }
+        selectedVers.append(m_flame_check_task->getDependencies());
     }
 
     // Report failed update checking
@@ -162,7 +171,7 @@ void ModUpdateDialog::checkCandidates()
             if (!recover_url.isEmpty())
                 //: %1 is the link to download it manually
                 text += tr("Possible solution: Getting the latest version manually:<br>%1<br>")
-                    .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
+                            .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
             text += "<br>";
         }
 
@@ -178,6 +187,45 @@ void ModUpdateDialog::checkCandidates()
         }
     }
 
+    {  // dependencies
+        auto depTask = makeShared<GetModDependenciesTask>(this, m_instance, m_mod_model.get(), selectedVers);
+
+        connect(depTask.get(), &Task::failed, this,
+                [&](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
+
+        connect(depTask.get(), &Task::succeeded, this, [&]() {
+            QStringList warnings = depTask->warnings();
+            if (warnings.count()) {
+                CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->exec();
+            }
+        });
+
+        ProgressDialog progress_dialog_deps(m_parent);
+        progress_dialog_deps.setSkipButton(true, tr("Abort"));
+        progress_dialog_deps.setWindowTitle(tr("Checking for dependencies..."));
+        auto dret = progress_dialog_deps.execWithTask(depTask.get());
+
+        // If the dialog was skipped / some download error happened
+        if (dret == QDialog::DialogCode::Rejected) {
+            m_aborted = true;
+            QMetaObject::invokeMethod(this, "reject", Qt::QueuedConnection);
+            return;
+        }
+        static FlameAPI api;
+
+        for (auto dep : depTask->getDependecies()) {
+            auto changelog = dep->version.changelog;
+            if (dep->pack->provider == ModPlatform::ResourceProvider::FLAME)
+                changelog = api.getModFileChangelog(dep->version.addonId.toInt(), dep->version.fileId.toInt());
+            auto download_task = makeShared<ResourceDownloadTask>(dep->pack, dep->version, m_mod_model);
+            CheckUpdateTask::UpdatableMod updatable = { dep->pack->name, dep->version.hash,   "",           dep->version.version,
+                                                        changelog,       dep->pack->provider, download_task };
+
+            appendMod(updatable);
+            m_tasks.insert(updatable.name, updatable.download);
+        }
+    }
+
     // If there's no mod to be updated
     if (ui->modTreeWidget->topLevelItemCount() == 0) {
         m_no_updates = true;
@@ -342,7 +390,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
     } else {
         QString reason{ tr("Couldn't find a valid version on the selected mod provider(s)") };
 
-        m_failed_metadata.append({mod, reason});
+        m_failed_metadata.append({ mod, reason });
     }
 }
 

From 158b07a39e98467c10682a64fa76eb31642abc9e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 00:24:08 +0300
Subject: [PATCH 06/35] moved getRequiredBy

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../mod/tasks/GetModDependenciesTask.cpp      | 29 +++++++++++++++++++
 .../mod/tasks/GetModDependenciesTask.h        |  1 +
 launcher/ui/dialogs/ModUpdateDialog.cpp       | 24 +++++++++++++--
 launcher/ui/dialogs/ModUpdateDialog.h         |  6 ++--
 .../ui/dialogs/ResourceDownloadDialog.cpp     | 29 +++----------------
 5 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
index f8ecdb33e..43d38cfdc 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
@@ -250,3 +250,32 @@ void GetModDependenciesTask::removePack(const QVariant addonId)
             ++it;
 #endif
 }
+
+QHash<QString, QStringList> GetModDependenciesTask::getRequiredBy()
+{
+    QHash<QString, QStringList> rby;
+    auto fullList = m_selected + m_pack_dependencies;
+    for (auto mod : fullList) {
+        auto addonId = mod->pack->addonId;
+        auto provider = mod->pack->provider;
+        auto version = mod->version.fileId;
+        auto req = QStringList();
+        for (auto& smod : fullList) {
+            if (provider != smod->pack->provider)
+                continue;
+            auto deps = smod->version.dependencies;
+            if (auto dep = std::find_if(deps.begin(), deps.end(),
+                                        [addonId, provider, version](const ModPlatform::Dependency& d) {
+                                            return d.type == ModPlatform::DependencyType::REQUIRED &&
+                                                   (provider == ModPlatform::ResourceProvider::MODRINTH && d.addonId.toString().isEmpty()
+                                                        ? version == d.version
+                                                        : d.addonId == addonId);
+                                        });
+                dep != deps.end()) {
+                req.append(smod->pack->name);
+            }
+        }
+        rby[addonId.toString()] = req;
+    }
+    return rby;
+}
\ No newline at end of file
diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
index 50eba6afc..5a29b6eae 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
@@ -62,6 +62,7 @@ class GetModDependenciesTask : public SequentialTask {
                                     QList<std::shared_ptr<PackDependency>> selected);
 
     auto getDependecies() const -> QList<std::shared_ptr<PackDependency>> { return m_pack_dependencies; }
+    QHash<QString, QStringList> getRequiredBy();
 
    protected slots:
     Task::Ptr prepareDependencyTask(const ModPlatform::Dependency&, const ModPlatform::ResourceProvider, int);
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 6629b1f23..33ea5a1d5 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -213,6 +213,8 @@ void ModUpdateDialog::checkCandidates()
         }
         static FlameAPI api;
 
+        auto getRequiredBy = depTask->getRequiredBy();
+
         for (auto dep : depTask->getDependecies()) {
             auto changelog = dep->version.changelog;
             if (dep->pack->provider == ModPlatform::ResourceProvider::FLAME)
@@ -221,7 +223,7 @@ void ModUpdateDialog::checkCandidates()
             CheckUpdateTask::UpdatableMod updatable = { dep->pack->name, dep->version.hash,   "",           dep->version.version,
                                                         changelog,       dep->pack->provider, download_task };
 
-            appendMod(updatable);
+            appendMod(updatable, getRequiredBy.value(dep->version.addonId.toString()));
             m_tasks.insert(updatable.name, updatable.download);
         }
     }
@@ -394,7 +396,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
     }
 }
 
-void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
+void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info, QStringList requiredBy)
 {
     auto item_top = new QTreeWidgetItem(ui->modTreeWidget);
     item_top->setCheckState(0, Qt::CheckState::Checked);
@@ -410,6 +412,24 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     auto new_version_item = new QTreeWidgetItem(item_top);
     new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
 
+    if (!requiredBy.isEmpty()) {
+        auto new_version_item = new QTreeWidgetItem(item_top);
+        new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
+
+        auto requiredByItem = new QTreeWidgetItem(item_top);
+        if (requiredBy.length() == 1) {
+            requiredByItem->setText(0, tr("Required by: %1").arg(requiredBy.back()));
+        } else {
+            requiredByItem->setText(0, tr("Required by:"));
+            auto i = 0;
+            for (auto req : requiredBy) {
+                auto reqItem = new QTreeWidgetItem(requiredByItem);
+                reqItem->setText(0, req);
+                reqItem->insertChildren(i++, { reqItem });
+            }
+        }
+    }
+
     auto changelog_item = new QTreeWidgetItem(item_top);
     changelog_item->setText(0, tr("Changelog of the latest version"));
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.h b/launcher/ui/dialogs/ModUpdateDialog.h
index 1a92f6134..b79aa4943 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.h
+++ b/launcher/ui/dialogs/ModUpdateDialog.h
@@ -23,7 +23,7 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
     void checkCandidates();
 
-    void appendMod(const CheckUpdateTask::UpdatableMod& info);
+    void appendMod(const CheckUpdateTask::UpdatableMod& info, QStringList requiredBy = {});
 
     const QList<ResourceDownloadTask::Ptr> getTasks();
     auto indexDir() const -> QDir { return m_mod_model->indexDir(); }
@@ -36,7 +36,9 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
    private slots:
     void onMetadataEnsured(Mod*);
-    void onMetadataFailed(Mod*, bool try_others = false, ModPlatform::ResourceProvider first_choice = ModPlatform::ResourceProvider::MODRINTH);
+    void onMetadataFailed(Mod*,
+                          bool try_others = false,
+                          ModPlatform::ResourceProvider first_choice = ModPlatform::ResourceProvider::MODRINTH);
 
    private:
     QWidget* m_parent;
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index 4f59f5605..0e579ce60 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -125,35 +125,12 @@ void ResourceDownloadDialog::connectButtons()
 
 static ModPlatform::ProviderCapabilities ProviderCaps;
 
-QStringList getRequiredBy(QList<ResourceDownloadDialog::DownloadTaskPtr> tasks, ResourceDownloadDialog::DownloadTaskPtr pack)
-{
-    auto addonId = pack->getPack()->addonId;
-    auto provider = pack->getPack()->provider;
-    auto version = pack->getVersionID();
-    auto req = QStringList();
-    for (auto& task : tasks) {
-        if (provider != task->getPack()->provider)
-            continue;
-        auto deps = task->getVersion().dependencies;
-        if (auto dep = std::find_if(deps.begin(), deps.end(),
-                                    [addonId, provider, version](const ModPlatform::Dependency& d) {
-                                        return d.type == ModPlatform::DependencyType::REQUIRED &&
-                                               (provider == ModPlatform::ResourceProvider::MODRINTH && d.addonId.toString().isEmpty()
-                                                    ? version == d.version
-                                                    : d.addonId == addonId);
-                                    });
-            dep != deps.end()) {
-            req.append(task->getName());
-        }
-    }
-    return req;
-}
-
 void ResourceDownloadDialog::confirm()
 {
     auto confirm_dialog = ReviewMessageBox::create(this, tr("Confirm %1 to download").arg(resourcesString()));
     confirm_dialog->retranslateUi(resourcesString());
 
+    QHash<QString, QStringList> getRequiredBy;
     if (auto task = getModDependenciesTask(); task) {
         connect(task.get(), &Task::failed, this,
                 [&](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->exec(); });
@@ -178,6 +155,7 @@ void ResourceDownloadDialog::confirm()
         } else {
             for (auto dep : task->getDependecies())
                 addResource(dep->pack, dep->version);
+            getRequiredBy = task->getRequiredBy();
         }
     }
 
@@ -187,7 +165,8 @@ void ResourceDownloadDialog::confirm()
     });
     for (auto& task : selected) {
         confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
-                                         ProviderCaps.name(task->getProvider()), getRequiredBy(selected, task) });
+                                         ProviderCaps.name(task->getProvider()),
+                                         getRequiredBy.value(task->getPack()->addonId.toString()) });
     }
 
     if (confirm_dialog->exec()) {

From 6f7d901a1f5c02e0629e4bae9172c04bb81ce0d9 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 09:17:28 +0300
Subject: [PATCH 07/35] removed extra variable

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/ModUpdateDialog.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 33ea5a1d5..66d7e3afa 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -413,9 +413,6 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info, QStri
     new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
 
     if (!requiredBy.isEmpty()) {
-        auto new_version_item = new QTreeWidgetItem(item_top);
-        new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
-
         auto requiredByItem = new QTreeWidgetItem(item_top);
         if (requiredBy.length() == 1) {
             requiredByItem->setText(0, tr("Required by: %1").arg(requiredBy.back()));

From 5f1074471d254ff82af1980e15a53b71ae121186 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 28 Jun 2023 13:35:42 +0300
Subject: [PATCH 08/35] Corected variable name

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../minecraft/auth/steps/XboxUserStep.cpp     |  2 +-
 launcher/modplatform/CheckUpdateTask.h        |  4 ++--
 launcher/modplatform/ModIndex.h               |  2 +-
 launcher/modplatform/flame/FlameAPI.cpp       |  2 +-
 .../modplatform/flame/FlameCheckUpdate.cpp    |  2 +-
 launcher/modplatform/flame/FlameModIndex.cpp  |  4 ++--
 .../modrinth/ModrinthCheckUpdate.cpp          |  2 +-
 .../modrinth/ModrinthPackIndex.cpp            |  4 ++--
 launcher/ui/dialogs/ModUpdateDialog.cpp       | 20 ++++++++++---------
 launcher/ui/pages/modplatform/ModPage.cpp     |  2 +-
 .../ui/pages/modplatform/ResourcePage.cpp     |  4 ++--
 .../ui/pages/modplatform/flame/FlamePage.cpp  | 11 ++++------
 .../modplatform/modrinth/ModrinthPage.cpp     |  5 +++--
 13 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/launcher/minecraft/auth/steps/XboxUserStep.cpp b/launcher/minecraft/auth/steps/XboxUserStep.cpp
index 842eb60ff..06b67e81f 100644
--- a/launcher/minecraft/auth/steps/XboxUserStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxUserStep.cpp
@@ -38,7 +38,7 @@ void XboxUserStep::perform() {
     QNetworkRequest request = QNetworkRequest(QUrl("https://user.auth.xboxlive.com/user/authenticate"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     request.setRawHeader("Accept", "application/json");
-    // set contract-verison header (prevent err 400 bad-request?)
+    // set contract-version header (prevent err 400 bad-request?)
     // https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
     request.setRawHeader("x-xbl-contract-version", "1"); 
 
diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h
index fbafedd77..65c80d268 100644
--- a/launcher/modplatform/CheckUpdateTask.h
+++ b/launcher/modplatform/CheckUpdateTask.h
@@ -23,7 +23,7 @@ class CheckUpdateTask : public Task {
         QString old_hash;
         QString old_version;
         QString new_version;
-        std::optional<ModPlatform::IndexedVersionType> new_verison_type;
+        std::optional<ModPlatform::IndexedVersionType> new_version_type;
         QString changelog;
         ModPlatform::ResourceProvider provider;
         shared_qobject_ptr<ResourceDownloadTask> download;
@@ -41,7 +41,7 @@ class CheckUpdateTask : public Task {
             , old_hash(old_h)
             , old_version(old_v)
             , new_version(new_v)
-            , new_verison_type(new_v_type)
+            , new_version_type(new_v_type)
             , changelog(changelog)
             , provider(p)
             , download(t)
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index b47d09487..4ed9e7ebe 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -96,7 +96,7 @@ struct IndexedVersion {
     QVariant fileId;
     QString version;
     QString version_number = {};
-    IndexedVersionType verison_type;
+    IndexedVersionType version_type;
     QStringList mcVersion;
     QString downloadUrl;
     QString date;
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 434703009..885c46873 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -135,7 +135,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
                 auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                bool better_release = file_tmp.verison_type <= ver_tmp.verison_type;
+                bool better_release = file_tmp.version_type <= ver_tmp.version_type;
                 if (file_tmp.date > ver_tmp.date && better_release) {
                     ver_tmp = file_tmp;
                     latest_file_obj = file_obj;
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index cf159cad7..5ff833cfa 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -173,7 +173,7 @@ void FlameCheckUpdate::executeTask()
             }
 
             auto download_task = makeShared<ResourceDownloadTask>(pack, latest_ver, m_mods_folder);
-            m_updatable.emplace_back(pack->name, mod->metadata()->hash, old_version, latest_ver.version, latest_ver.verison_type,
+            m_updatable.emplace_back(pack->name, mod->metadata()->hash, old_version, latest_ver.version, latest_ver.version_type,
                                      api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
                                      ModPlatform::ResourceProvider::FLAME, download_task);
         }
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 108d8b37f..5a44d4db7 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -94,7 +94,7 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.verison_type <= b.verison_type;
+        bool a_better_release = a.version_type <= b.version_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
@@ -124,7 +124,7 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     file.version = Json::requireString(obj, "displayName");
     file.downloadUrl = Json::ensureString(obj, "downloadUrl");
     file.fileName = Json::requireString(obj, "fileName");
-    file.verison_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
+    file.version_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
 
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index 3ee22818a..845e0c61e 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -162,7 +162,7 @@ void ModrinthCheckUpdate::executeTask()
 
                     auto download_task = makeShared<ResourceDownloadTask>(pack, project_ver, m_mods_folder);
 
-                    m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.verison_type,
+                    m_updatable.emplace_back(pack->name, hash, mod->version(), project_ver.version_number, project_ver.version_type,
                                              project_ver.changelog, ModPlatform::ResourceProvider::MODRINTH, download_task);
                 }
             }
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 4d0882f64..d93d870cf 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -109,7 +109,7 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.verison_type <= b.verison_type;
+        bool a_better_release = a.version_type <= b.version_type;
         // dates are in RFC 3339 format
         return a.date > b.date && a_better_release;
     };
@@ -139,7 +139,7 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
     }
     file.version = Json::requireString(obj, "name");
     file.version_number = Json::requireString(obj, "version_number");
-    file.verison_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
+    file.version_type = ModPlatform::IndexedVersionType(Json::requireString(obj, "version_type"));
 
     file.changelog = Json::requireString(obj, "changelog");
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 9e010444c..79622ff74 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -89,15 +89,17 @@ void ModUpdateDialog::checkCandidates()
 
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
-        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
-        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_flame_check_task);
     }
 
@@ -162,7 +164,7 @@ void ModUpdateDialog::checkCandidates()
             if (!recover_url.isEmpty())
                 //: %1 is the link to download it manually
                 text += tr("Possible solution: Getting the latest version manually:<br>%1<br>")
-                    .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
+                            .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
             text += "<br>";
         }
 
@@ -342,7 +344,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
     } else {
         QString reason{ tr("Couldn't find a valid version on the selected mod provider(s)") };
 
-        m_failed_metadata.append({mod, reason});
+        m_failed_metadata.append({ mod, reason });
     }
 }
 
@@ -362,11 +364,11 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     auto new_version_item = new QTreeWidgetItem(item_top);
     new_version_item->setText(0, tr("New version: %1").arg(info.new_version));
 
-    if (info.new_verison_type.has_value()) {
+    if (info.new_version_type.has_value()) {
         auto new_version_type_itme = new QTreeWidgetItem(item_top);
-        new_version_type_itme->setText(0, tr("New Version Type: %1").arg(info.new_verison_type.value().toString()));
+        new_version_type_itme->setText(0, tr("New Version Type: %1").arg(info.new_version_type.value().toString()));
     }
-    
+
     auto changelog_item = new QTreeWidgetItem(item_top);
     changelog_item->setText(0, tr("Changelog of the latest version"));
 
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index 9c9954a44..9b178048f 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -133,7 +133,7 @@ void ModPage::updateVersionList()
 
         // Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
         if ((valid || m_filter->versions.empty()) && !optedOut(version)) {
-            auto release_type = version.verison_type.isValid() ? QString(" : %1").arg(version.verison_type.toString()) : "";
+            auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
             m_ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(i));
         }
     }
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 5c8f23d22..3619c51a4 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -268,8 +268,8 @@ void ResourcePage::updateVersionList()
             if (optedOut(version))
                 continue;
 
-            auto release_type = current_pack->versions[i].verison_type.isValid()
-                                    ? QString(" : %1").arg(current_pack->versions[i].verison_type.toString())
+            auto release_type = current_pack->versions[i].version_type.isValid()
+                                    ? QString(" [%1]").arg(current_pack->versions[i].version_type.toString())
                                     : "";
             m_ui->versionSelectionBox->addItem(current_pack->versions[i].version, QVariant(i));
         }
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index 575211515..aad376942 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -42,9 +42,9 @@
 #include "FlameModel.h"
 #include "InstanceImportTask.h"
 #include "Json.h"
+#include "modplatform/flame/FlameAPI.h"
 #include "ui/dialogs/NewInstanceDialog.h"
 #include "ui/widgets/ProjectItem.h"
-#include "modplatform/flame/FlameAPI.h"
 
 static FlameAPI api;
 
@@ -155,7 +155,7 @@ void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
             }
 
             for (auto version : current.versions) {
-                auto release_type = version.version_type.isValid() ? QString(" : %1").arg(version.version_type.toString()) : "";
+                auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
                 ui->versionSelectionBox->addItem(QString("%1%2").arg(version.version, release_type), QVariant(version.downloadUrl));
             }
 
@@ -253,10 +253,8 @@ void FlamePage::updateUi()
         text += "<br>" + tr(" by ") + authorStrs.join(", ");
     }
 
-    if(current.extraInfoLoaded) {
-        if (!current.extra.issuesUrl.isEmpty()
-         || !current.extra.sourceUrl.isEmpty()
-         || !current.extra.wikiUrl.isEmpty()) {
+    if (current.extraInfoLoaded) {
+        if (!current.extra.issuesUrl.isEmpty() || !current.extra.sourceUrl.isEmpty() || !current.extra.wikiUrl.isEmpty()) {
             text += "<br><br>" + tr("External links:") + "<br>";
         }
 
@@ -268,7 +266,6 @@ void FlamePage::updateUi()
             text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current.extra.sourceUrl) + "<br>";
     }
 
-
     text += "<hr>";
     text += api.getModDescription(current.addonId).toUtf8();
 
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 9ca26ea9a..c41f118a6 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -199,9 +199,10 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
                 qWarning() << "Error while reading modrinth modpack version: " << e.cause();
             }
             for (auto version : current.versions) {
-                auto release_type = version.version_type.isValid() ? QString(" : %1").arg(version.version_type.toString()) : "";
+                auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
                 if (!version.name.contains(version.version))
-                    ui->versionSelectionBox->addItem(QString("%1 — %2%3").arg(version.name, version.version, release_type), QVariant(version.id));
+                    ui->versionSelectionBox->addItem(QString("%1 — %2%3").arg(version.name, version.version, release_type),
+                                                     QVariant(version.id));
                 else
                     ui->versionSelectionBox->addItem(QString("%1%2").arg(version.name, release_type), QVariant(version.id));
             }

From 3ad559ab22b6b20264eebb826efc4227374a64cc Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 28 Jun 2023 17:43:09 +0300
Subject: [PATCH 09/35] Added version type to review message dialog

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/ResourceDownloadDialog.cpp | 3 ++-
 launcher/ui/dialogs/ReviewMessageBox.cpp       | 4 ++++
 launcher/ui/dialogs/ReviewMessageBox.h         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index 4f59f5605..4b29df0ad 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -187,7 +187,8 @@ void ResourceDownloadDialog::confirm()
     });
     for (auto& task : selected) {
         confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
-                                         ProviderCaps.name(task->getProvider()), getRequiredBy(selected, task) });
+                                         ProviderCaps.name(task->getProvider()), getRequiredBy(selected, task),
+                                         task->getVersion().version_type.toString() });
     }
 
     if (confirm_dialog->exec()) {
diff --git a/launcher/ui/dialogs/ReviewMessageBox.cpp b/launcher/ui/dialogs/ReviewMessageBox.cpp
index 7b33765fd..d1b7bd156 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.cpp
+++ b/launcher/ui/dialogs/ReviewMessageBox.cpp
@@ -77,6 +77,10 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
         itemTop->insertChildren(childIndx++, { requiredByItem });
     }
 
+    auto versionTypeItem = new QTreeWidgetItem(itemTop);
+    versionTypeItem->setText(0, tr("Version Type: %1").arg(info.version_type));
+    itemTop->insertChildren(childIndx++, { versionTypeItem });
+
     ui->modTreeWidget->addTopLevelItem(itemTop);
 }
 
diff --git a/launcher/ui/dialogs/ReviewMessageBox.h b/launcher/ui/dialogs/ReviewMessageBox.h
index a520cc2a6..596f39c8e 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.h
+++ b/launcher/ui/dialogs/ReviewMessageBox.h
@@ -18,6 +18,7 @@ class ReviewMessageBox : public QDialog {
         QString custom_file_path{};
         QString provider;
         QStringList required_by;
+        QString version_type;
     };
 
     void appendResource(ResourceInformation&& info);

From cebb4dd17ae9bfab35210250ab7a5484c644abb0 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 20:39:53 +0300
Subject: [PATCH 10/35] made the number of concurrent tasks configurable

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/Application.cpp                      |  2 ++
 launcher/modplatform/EnsureMetadataTask.cpp   |  2 +-
 .../modplatform/flame/FlamePackExportTask.cpp |  2 +-
 .../modrinth/ModrinthCheckUpdate.cpp          |  2 +-
 launcher/tasks/ConcurrentTask.h               |  5 +++-
 launcher/ui/dialogs/BlockedModsDialog.cpp     |  4 ++--
 launcher/ui/pages/global/LauncherPage.cpp     |  4 ++++
 launcher/ui/pages/global/LauncherPage.ui      | 23 +++++++++++++++++++
 8 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 5aa9efc4a..e427eebdc 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -529,6 +529,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         m_settings->registerSetting("MenuBarInsteadOfToolBar", false);
 
+        m_settings->registerSetting("NumberOfConcurrentTasks", 6);
+
         QString defaultMonospace;
         int defaultSize = 11;
 #ifdef Q_OS_WIN32
diff --git a/launcher/modplatform/EnsureMetadataTask.cpp b/launcher/modplatform/EnsureMetadataTask.cpp
index c3eadd06d..6977c1128 100644
--- a/launcher/modplatform/EnsureMetadataTask.cpp
+++ b/launcher/modplatform/EnsureMetadataTask.cpp
@@ -33,7 +33,7 @@ EnsureMetadataTask::EnsureMetadataTask(Mod* mod, QDir dir, ModPlatform::Resource
 EnsureMetadataTask::EnsureMetadataTask(QList<Mod*>& mods, QDir dir, ModPlatform::ResourceProvider prov)
     : Task(nullptr), m_index_dir(dir), m_provider(prov), m_current_task(nullptr)
 {
-    m_hashing_task.reset(new ConcurrentTask(this, "MakeHashesTask", 10));
+    m_hashing_task.reset(new ConcurrentTask(this, "MakeHashesTask"));
     for (auto* mod : mods) {
         auto hash_task = createNewHash(mod);
         if (!hash_task)
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index ac0da2142..48ddddf70 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -108,7 +108,7 @@ void FlamePackExportTask::collectHashes()
     setStatus(tr("Finding file hashes..."));
     setProgress(1, 5);
     auto allMods = mcInstance->loaderModList()->allMods();
-    ConcurrentTask::Ptr hashingTask(new ConcurrentTask(this, "MakeHashesTask", 10));
+    ConcurrentTask::Ptr hashingTask(new ConcurrentTask(this, "MakeHashesTask"));
     task.reset(hashingTask);
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index a7c22832a..3b0528f0d 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -39,7 +39,7 @@ void ModrinthCheckUpdate::executeTask()
     QStringList hashes;
     auto best_hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
 
-    ConcurrentTask hashing_task(this, "MakeModrinthHashesTask", 10);
+    ConcurrentTask hashing_task(this, "MakeModrinthHashesTask");
     for (auto* mod : m_mods) {
         if (!mod->enabled()) {
             emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
diff --git a/launcher/tasks/ConcurrentTask.h b/launcher/tasks/ConcurrentTask.h
index 6325fc9e7..7130ca3a9 100644
--- a/launcher/tasks/ConcurrentTask.h
+++ b/launcher/tasks/ConcurrentTask.h
@@ -41,6 +41,7 @@
 #include <QUuid>
 #include <memory>
 
+#include "Application.h"
 #include "tasks/Task.h"
 
 class ConcurrentTask : public Task {
@@ -48,7 +49,9 @@ class ConcurrentTask : public Task {
    public:
     using Ptr = shared_qobject_ptr<ConcurrentTask>;
 
-    explicit ConcurrentTask(QObject* parent = nullptr, QString task_name = "", int max_concurrent = 6);
+    explicit ConcurrentTask(QObject* parent = nullptr,
+                            QString task_name = "",
+                            int max_concurrent = APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
     ~ConcurrentTask() override;
 
     bool canAbort() const override { return true; }
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index fdfae5973..ebb136ede 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -44,7 +44,7 @@
 BlockedModsDialog::BlockedModsDialog(QWidget* parent, const QString& title, const QString& text, QList<BlockedMod>& mods)
     : QDialog(parent), ui(new Ui::BlockedModsDialog), m_mods(mods)
 {
-    m_hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask", 10));
+    m_hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask"));
     connect(m_hashing_task.get(), &Task::finished, this, &BlockedModsDialog::hashTaskFinished);
 
     ui->setupUi(this);
@@ -313,7 +313,7 @@ bool BlockedModsDialog::checkValidPath(QString path)
     // efectivly compare two strings ignoring all separators and case
     auto laxCompare = [](QString fsfilename, QString metadataFilename) {
         // allowed character seperators
-        QList<QChar> allowedSeperators = { '-', '+', '.' , '_'};
+        QList<QChar> allowedSeperators = { '-', '+', '.', '_' };
 
         // copy in lowercase
         auto fsName = fsfilename.toLower();
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 816dde723..9d62258ac 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -201,6 +201,8 @@ void LauncherPage::applySettings()
 
     s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
 
+    s->set("NumberOfConcurrentTasks", ui->numberOfConcurrentTasksSpinBox->value());
+
     // Console settings
     s->set("ShowConsole", ui->showConsoleCheck->isChecked());
     s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
@@ -251,6 +253,8 @@ void LauncherPage::loadSettings()
 #endif
     ui->preferMenuBarCheckBox->setChecked(s->get("MenuBarInsteadOfToolBar").toBool());
 
+    ui->numberOfConcurrentTasksSpinBox->setValue(s->get("NumberOfConcurrentTasks").toInt());
+
     // Console settings
     ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
     ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 26408f44f..33ad39442 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -189,6 +189,29 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="miscellaneousGroupBox">
+         <property name="title">
+          <string>Miscellaneous</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="numberOfConcurrentTasksLabel">
+            <property name="text">
+             <string>Number of concurrent tasks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="numberOfConcurrentTasksSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">

From db9f5f44e08dae27578f0d74e5092f47e40a1216 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 22:26:22 +0300
Subject: [PATCH 11/35] Split in two the options

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/Application.cpp                        |  3 ++-
 launcher/minecraft/mod/ResourceFolderModel.cpp  |  1 +
 launcher/modplatform/EnsureMetadataTask.cpp     |  3 ++-
 .../modplatform/flame/FlamePackExportTask.cpp   |  4 +++-
 .../modrinth/ModrinthCheckUpdate.cpp            |  2 +-
 launcher/net/NetJob.cpp                         |  5 +++++
 launcher/net/NetJob.h                           |  2 +-
 launcher/tasks/ConcurrentTask.h                 |  8 ++++----
 launcher/ui/dialogs/BlockedModsDialog.cpp       |  3 ++-
 launcher/ui/dialogs/ModUpdateDialog.cpp         | 17 ++++++++++-------
 launcher/ui/pages/global/LauncherPage.cpp       |  2 ++
 launcher/ui/pages/global/LauncherPage.ui        | 14 ++++++++++++++
 launcher/ui/pages/instance/ModFolderPage.cpp    |  4 ++--
 launcher/ui/pages/instance/ResourcePackPage.cpp |  3 ++-
 launcher/ui/pages/instance/ShaderPackPage.cpp   |  2 +-
 launcher/ui/pages/instance/TexturePackPage.cpp  |  3 ++-
 launcher/ui/pages/modplatform/ResourceModel.cpp |  1 +
 17 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e427eebdc..8f52c41cf 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -529,7 +529,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         m_settings->registerSetting("MenuBarInsteadOfToolBar", false);
 
-        m_settings->registerSetting("NumberOfConcurrentTasks", 6);
+        m_settings->registerSetting("NumberOfConcurrentTasks", 10);
+        m_settings->registerSetting("NumberOfConcurrentDownloads", 6);
 
         QString defaultMonospace;
         int defaultSize = 11;
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index 39a61067e..e2aa957be 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -33,6 +33,7 @@ ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObje
 
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &ResourceFolderModel::directoryChanged);
     connect(&m_helper_thread_task, &ConcurrentTask::finished, this, [this] { m_helper_thread_task.clear(); });
+    m_helper_thread_task.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
 }
 
 ResourceFolderModel::~ResourceFolderModel()
diff --git a/launcher/modplatform/EnsureMetadataTask.cpp b/launcher/modplatform/EnsureMetadataTask.cpp
index 6977c1128..a9ad22581 100644
--- a/launcher/modplatform/EnsureMetadataTask.cpp
+++ b/launcher/modplatform/EnsureMetadataTask.cpp
@@ -3,6 +3,7 @@
 #include <MurmurHash2.h>
 #include <QDebug>
 
+#include "Application.h"
 #include "Json.h"
 
 #include "minecraft/mod/Mod.h"
@@ -33,7 +34,7 @@ EnsureMetadataTask::EnsureMetadataTask(Mod* mod, QDir dir, ModPlatform::Resource
 EnsureMetadataTask::EnsureMetadataTask(QList<Mod*>& mods, QDir dir, ModPlatform::ResourceProvider prov)
     : Task(nullptr), m_index_dir(dir), m_provider(prov), m_current_task(nullptr)
 {
-    m_hashing_task.reset(new ConcurrentTask(this, "MakeHashesTask"));
+    m_hashing_task.reset(new ConcurrentTask(this, "MakeHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()));
     for (auto* mod : mods) {
         auto hash_task = createNewHash(mod);
         if (!hash_task)
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 48ddddf70..b0e5638d9 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -27,6 +27,7 @@
 #include <QtConcurrentRun>
 #include <algorithm>
 #include <memory>
+#include "Application.h"
 #include "Json.h"
 #include "MMCZip.h"
 #include "minecraft/PackProfile.h"
@@ -108,7 +109,8 @@ void FlamePackExportTask::collectHashes()
     setStatus(tr("Finding file hashes..."));
     setProgress(1, 5);
     auto allMods = mcInstance->loaderModList()->allMods();
-    ConcurrentTask::Ptr hashingTask(new ConcurrentTask(this, "MakeHashesTask"));
+    ConcurrentTask::Ptr hashingTask(
+        new ConcurrentTask(this, "MakeHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()));
     task.reset(hashingTask);
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index 3b0528f0d..c1f83bbc5 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -39,7 +39,7 @@ void ModrinthCheckUpdate::executeTask()
     QStringList hashes;
     auto best_hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
 
-    ConcurrentTask hashing_task(this, "MakeModrinthHashesTask");
+    ConcurrentTask hashing_task(this, "MakeModrinthHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
     for (auto* mod : m_mods) {
         if (!mod->enabled()) {
             emit checkFailed(mod, tr("Disabled mods won't be updated, to prevent mod duplication issues!"));
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index 3869316e3..b99c5acb0 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -36,6 +36,11 @@
  */
 
 #include "NetJob.h"
+#include "Application.h"
+
+NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network)
+    : ConcurrentTask(nullptr, job_name, APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt()), m_network(network)
+{}
 
 auto NetJob::addNetAction(NetAction::Ptr action) -> bool
 {
diff --git a/launcher/net/NetJob.h b/launcher/net/NetJob.h
index 764cec18b..1c4337ec6 100644
--- a/launcher/net/NetJob.h
+++ b/launcher/net/NetJob.h
@@ -52,7 +52,7 @@ class NetJob : public ConcurrentTask {
    public:
     using Ptr = shared_qobject_ptr<NetJob>;
 
-    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : ConcurrentTask(nullptr, job_name), m_network(network) {}
+    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network);
     ~NetJob() override = default;
 
     void startNext() override;
diff --git a/launcher/tasks/ConcurrentTask.h b/launcher/tasks/ConcurrentTask.h
index 7130ca3a9..1c333ce02 100644
--- a/launcher/tasks/ConcurrentTask.h
+++ b/launcher/tasks/ConcurrentTask.h
@@ -41,7 +41,6 @@
 #include <QUuid>
 #include <memory>
 
-#include "Application.h"
 #include "tasks/Task.h"
 
 class ConcurrentTask : public Task {
@@ -49,11 +48,12 @@ class ConcurrentTask : public Task {
    public:
     using Ptr = shared_qobject_ptr<ConcurrentTask>;
 
-    explicit ConcurrentTask(QObject* parent = nullptr,
-                            QString task_name = "",
-                            int max_concurrent = APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
+    explicit ConcurrentTask(QObject* parent = nullptr, QString task_name = "", int max_concurrent = 6);
     ~ConcurrentTask() override;
 
+    // safe to call before starting the task
+    void setMaxConcurrent(int max_concurrent) { m_total_max_size = max_concurrent; }
+
     bool canAbort() const override { return true; }
 
     inline auto isMultiStep() const -> bool override { return totalSize() > 1; };
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index ebb136ede..5a1a2f80e 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -44,7 +44,8 @@
 BlockedModsDialog::BlockedModsDialog(QWidget* parent, const QString& title, const QString& text, QList<BlockedMod>& mods)
     : QDialog(parent), ui(new Ui::BlockedModsDialog), m_mods(mods)
 {
-    m_hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask"));
+    m_hashing_task = shared_qobject_ptr<ConcurrentTask>(
+        new ConcurrentTask(this, "MakeHashesTask", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()));
     connect(m_hashing_task.get(), &Task::finished, this, &BlockedModsDialog::hashTaskFinished);
 
     ui->setupUi(this);
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 8618b9240..d08c2898f 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -43,7 +43,8 @@ ModUpdateDialog::ModUpdateDialog(QWidget* parent,
     , m_parent(parent)
     , m_mod_model(mods)
     , m_candidates(search_for)
-    , m_second_try_metadata(new ConcurrentTask())
+    , m_second_try_metadata(
+          new ConcurrentTask(nullptr, "Second Metadata Search", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()))
     , m_instance(instance)
 {
     ReviewMessageBox::setGeometry(0, 0, 800, 600);
@@ -89,15 +90,17 @@ void ModUpdateDialog::checkCandidates()
 
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
-        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
-        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
+        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+            m_failed_check_update.append({ mod, reason, recover_url });
+        });
         check_task.addTask(m_flame_check_task);
     }
 
@@ -162,7 +165,7 @@ void ModUpdateDialog::checkCandidates()
             if (!recover_url.isEmpty())
                 //: %1 is the link to download it manually
                 text += tr("Possible solution: Getting the latest version manually:<br>%1<br>")
-                    .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
+                            .arg(QString("<a href='%1'>%1</a>").arg(recover_url.toString()));
             text += "<br>";
         }
 
@@ -342,7 +345,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::R
     } else {
         QString reason{ tr("Couldn't find a valid version on the selected mod provider(s)") };
 
-        m_failed_metadata.append({mod, reason});
+        m_failed_metadata.append({ mod, reason });
     }
 }
 
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 9d62258ac..86597a5e4 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -202,6 +202,7 @@ void LauncherPage::applySettings()
     s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
 
     s->set("NumberOfConcurrentTasks", ui->numberOfConcurrentTasksSpinBox->value());
+    s->set("NumberOfConcurrentDownloads", ui->numberOfConcurrentDownloadsSpinBox->value());
 
     // Console settings
     s->set("ShowConsole", ui->showConsoleCheck->isChecked());
@@ -254,6 +255,7 @@ void LauncherPage::loadSettings()
     ui->preferMenuBarCheckBox->setChecked(s->get("MenuBarInsteadOfToolBar").toBool());
 
     ui->numberOfConcurrentTasksSpinBox->setValue(s->get("NumberOfConcurrentTasks").toInt());
+    ui->numberOfConcurrentDownloadsSpinBox->setValue(s->get("NumberOfConcurrentDownloads").toInt());
 
     // Console settings
     ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 33ad39442..11c59ab78 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -209,6 +209,20 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="numberOfConcurrentDownloadsLabel">
+            <property name="text">
+             <string>Number of concurrent downloads</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index cef292bd9..a8ce68c56 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -166,7 +166,7 @@ void ModFolderPage::installMods()
 
     ResourceDownload::ModDownloadDialog mdownload(this, m_model, m_instance);
     if (mdownload.exec()) {
-        ConcurrentTask* tasks = new ConcurrentTask(this);
+        auto tasks = new ConcurrentTask(this, "Download Mods", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
             CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
             tasks->deleteLater();
@@ -225,7 +225,7 @@ void ModFolderPage::updateMods()
     }
 
     if (update_dialog.exec()) {
-        ConcurrentTask* tasks = new ConcurrentTask(this);
+        auto tasks = new ConcurrentTask(this, "Download Mods", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
             CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
             tasks->deleteLater();
diff --git a/launcher/ui/pages/instance/ResourcePackPage.cpp b/launcher/ui/pages/instance/ResourcePackPage.cpp
index 12b371df4..cba80142a 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.cpp
+++ b/launcher/ui/pages/instance/ResourcePackPage.cpp
@@ -72,7 +72,8 @@ void ResourcePackPage::downloadRPs()
 
     ResourceDownload::ResourcePackDownloadDialog mdownload(this, std::static_pointer_cast<ResourcePackFolderModel>(m_model), m_instance);
     if (mdownload.exec()) {
-        auto tasks = new ConcurrentTask(this);
+        auto tasks =
+            new ConcurrentTask(this, "Download Resource Pack", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
             CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
             tasks->deleteLater();
diff --git a/launcher/ui/pages/instance/ShaderPackPage.cpp b/launcher/ui/pages/instance/ShaderPackPage.cpp
index dc8b0a05b..40366a1be 100644
--- a/launcher/ui/pages/instance/ShaderPackPage.cpp
+++ b/launcher/ui/pages/instance/ShaderPackPage.cpp
@@ -65,7 +65,7 @@ void ShaderPackPage::downloadShaders()
 
     ResourceDownload::ShaderPackDownloadDialog mdownload(this, std::static_pointer_cast<ShaderPackFolderModel>(m_model), m_instance);
     if (mdownload.exec()) {
-        auto tasks = new ConcurrentTask(this);
+        auto tasks = new ConcurrentTask(this, "Download Shaders", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
             CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
             tasks->deleteLater();
diff --git a/launcher/ui/pages/instance/TexturePackPage.cpp b/launcher/ui/pages/instance/TexturePackPage.cpp
index e477ceda3..bc07d495c 100644
--- a/launcher/ui/pages/instance/TexturePackPage.cpp
+++ b/launcher/ui/pages/instance/TexturePackPage.cpp
@@ -74,7 +74,8 @@ void TexturePackPage::downloadTPs()
 
     ResourceDownload::TexturePackDownloadDialog mdownload(this, std::static_pointer_cast<TexturePackFolderModel>(m_model), m_instance);
     if (mdownload.exec()) {
-        auto tasks = new ConcurrentTask(this);
+        auto tasks =
+            new ConcurrentTask(this, "Download Texture Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
             CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
             tasks->deleteLater();
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 49405a02b..e0b663522 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -31,6 +31,7 @@ QHash<ResourceModel*, bool> ResourceModel::s_running_models;
 ResourceModel::ResourceModel(ResourceAPI* api) : QAbstractListModel(), m_api(api)
 {
     s_running_models.insert(this, true);
+    m_current_info_job.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
 }
 
 ResourceModel::~ResourceModel()

From 149b6d59cf848a3b3cd50b3aee1c112e9c47e633 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 23:22:11 +0300
Subject: [PATCH 12/35] fixed tests

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                         | 3 +++
 launcher/minecraft/mod/ResourceFolderModel.cpp  | 3 +++
 launcher/ui/pages/modplatform/ResourceModel.cpp | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index af3bc28e3..ea8b1b841 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -1094,6 +1094,9 @@ endif()
 
 # Add executable
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
+if(BUILD_TESTING)
+target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_TEST)
+endif()
 target_include_directories(Launcher_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(Launcher_logic
     systeminfo
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index e2aa957be..7c2dc4393 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -33,7 +33,10 @@ ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObje
 
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &ResourceFolderModel::directoryChanged);
     connect(&m_helper_thread_task, &ConcurrentTask::finished, this, [this] { m_helper_thread_task.clear(); });
+#ifndef LAUNCHER_TEST
+    // in tests the application macro doesn't work
     m_helper_thread_task.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
+#endif
 }
 
 ResourceFolderModel::~ResourceFolderModel()
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index e0b663522..9f95d0467 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -31,7 +31,9 @@ QHash<ResourceModel*, bool> ResourceModel::s_running_models;
 ResourceModel::ResourceModel(ResourceAPI* api) : QAbstractListModel(), m_api(api)
 {
     s_running_models.insert(this, true);
+#ifndef LAUNCHER_TEST
     m_current_info_job.setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
+#endif
 }
 
 ResourceModel::~ResourceModel()

From 71890707c034a0503a92128335c13773e51dc43b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 12 Aug 2023 12:54:10 +0300
Subject: [PATCH 13/35] format and apply the sugestion

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/ModIndex.cpp | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 2e0d9e37a..04fd42a7a 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -24,14 +24,11 @@
 
 namespace ModPlatform {
 
-static const QMap<QString, IndexedVersionType::Enum> s_indexed_version_type_names = {
-    {"release", IndexedVersionType::Enum::Release},
-    {"beta", IndexedVersionType::Enum::Beta},
-    {"alpha", IndexedVersionType::Enum::Alpha}
-};
+static const QMap<QString, IndexedVersionType::Enum> s_indexed_version_type_names = { { "release", IndexedVersionType::Enum::Release },
+                                                                                      { "beta", IndexedVersionType::Enum::Beta },
+                                                                                      { "alpha", IndexedVersionType::Enum::Alpha } };
 
-IndexedVersionType::IndexedVersionType(const QString& type): IndexedVersionType(enumFromString(type))
-{}
+IndexedVersionType::IndexedVersionType(const QString& type) : IndexedVersionType(enumFromString(type)) {}
 
 IndexedVersionType::IndexedVersionType(int type)
 {
@@ -60,13 +57,13 @@ IndexedVersionType::IndexedVersionType(const IndexedVersionType& other)
     m_type = other.m_type;
 }
 
-IndexedVersionType& IndexedVersionType::operator=(const IndexedVersionType& other) 
+IndexedVersionType& IndexedVersionType::operator=(const IndexedVersionType& other)
 {
     m_type = other.m_type;
     return *this;
 }
 
-const QString IndexedVersionType::toString (const IndexedVersionType::Enum& type)
+const QString IndexedVersionType::toString(const IndexedVersionType::Enum& type)
 {
     switch (type) {
         case IndexedVersionType::Enum::Release:
@@ -78,18 +75,12 @@ const QString IndexedVersionType::toString (const IndexedVersionType::Enum& type
         case IndexedVersionType::Enum::UNKNOWN:
         default:
             return "unknown";
-
     }
 }
 
 IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
 {
-    auto found = s_indexed_version_type_names.constFind(type);
-    if (found != s_indexed_version_type_names.constEnd()) {
-        return *found;
-    } else {
-        return IndexedVersionType::Enum::UNKNOWN;
-    }
+    return s_indexed_version_type_names.value(type, IndexedVersionType::Enum::UNKNOWN);
 }
 
 auto ProviderCapabilities::name(ResourceProvider p) -> const char*

From d3acac16e664b5b36d5f7eb0c857bb400fdbdac8 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 18 Aug 2023 13:10:13 +0300
Subject: [PATCH 14/35] added -Wno-gnu-zero-variadic-macro-arguments and fixed
 more warnings

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 cmake/CompilerWarnings.cmake                 | 4 ++++
 launcher/java/JavaInstall.h                  | 6 +++---
 launcher/minecraft/mod/ResourceFolderModel.h | 3 ++-
 launcher/ui/widgets/VersionSelectWidget.h    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
index 635e54289..0ded8fd60 100644
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -90,6 +90,10 @@ function(
         -Wdouble-promotion # warn if float is implicit promoted to double
         -Wformat=2 # warn on security issues around functions that format output (ie printf)
         -Wimplicit-fallthrough # warn on statements that fallthrough without an explicit annotation
+        # -Wgnu-zero-variadic-macro-arguments (part of -pedantic) is triggered by every qCDebug() call and therefore results
+        # in a lot of noise. This warning is only notifying us that clang is emulating the GCC behaviour
+        # instead of the exact standard wording so we can safely ignore it
+        -Wno-gnu-zero-variadic-macro-arguments
     )
   endif()
 
diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 30815b5a8..49e9ed06e 100644
--- a/launcher/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
@@ -24,11 +24,11 @@
 struct JavaInstall : public BaseVersion {
     JavaInstall() {}
     JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
-    virtual QString descriptor() { return id.toString(); }
+    virtual QString descriptor() override { return id.toString(); }
 
-    virtual QString name() { return id.toString(); }
+    virtual QString name() override { return id.toString(); }
 
-    virtual QString typeString() const { return arch; }
+    virtual QString typeString() const override { return arch; }
 
     virtual bool operator<(BaseVersion& a) override;
     virtual bool operator>(BaseVersion& a) override;
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h
index 80c31e456..60b8879c0 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.h
+++ b/launcher/minecraft/mod/ResourceFolderModel.h
@@ -330,7 +330,8 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
 
         // When you have a Qt build with assertions turned on, proceeding here will abort the application
         if (added_set.size() > 0) {
-            beginInsertRows(QModelIndex(), m_resources.size(), m_resources.size() + added_set.size() - 1);
+            beginInsertRows(QModelIndex(), static_cast<int>(m_resources.size()),
+                            static_cast<int>(m_resources.size() + added_set.size() - 1));
 
             for (auto& added : added_set) {
                 auto res = new_resources[added];
diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h
index 99729fbdf..d5ef1cc9f 100644
--- a/launcher/ui/widgets/VersionSelectWidget.h
+++ b/launcher/ui/widgets/VersionSelectWidget.h
@@ -82,7 +82,7 @@ class VersionSelectWidget : public QWidget {
     void selectedVersionChanged(BaseVersion::Ptr version);
 
    protected:
-    virtual void closeEvent(QCloseEvent*);
+    virtual void closeEvent(QCloseEvent*) override;
 
    private slots:
     void onTaskSucceeded();

From 254444470f020b086648ac496ebfffb7d3e9ce05 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 20 Aug 2023 16:40:58 +0300
Subject: [PATCH 15/35] renamed enum type

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/ModIndex.cpp           | 40 +++++++++------------
 launcher/modplatform/ModIndex.h             | 29 ++++++++-------
 launcher/modplatform/flame/FlamePackIndex.h |  2 --
 3 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 04fd42a7a..17edcdb5d 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -24,30 +24,32 @@
 
 namespace ModPlatform {
 
-static const QMap<QString, IndexedVersionType::Enum> s_indexed_version_type_names = { { "release", IndexedVersionType::Enum::Release },
-                                                                                      { "beta", IndexedVersionType::Enum::Beta },
-                                                                                      { "alpha", IndexedVersionType::Enum::Alpha } };
+static const QMap<QString, IndexedVersionType::VersionType> s_indexed_version_type_names = {
+    { "release", IndexedVersionType::VersionType::Release },
+    { "beta", IndexedVersionType::VersionType::Beta },
+    { "alpha", IndexedVersionType::VersionType::Alpha }
+};
 
 IndexedVersionType::IndexedVersionType(const QString& type) : IndexedVersionType(enumFromString(type)) {}
 
-IndexedVersionType::IndexedVersionType(int type)
+IndexedVersionType::IndexedVersionType(int flame_type)
 {
-    switch (type) {
+    switch (flame_type) {
         case 1:
-            m_type = IndexedVersionType::Enum::Release;
+            m_type = IndexedVersionType::VersionType::Release;
             break;
         case 2:
-            m_type = IndexedVersionType::Enum::Beta;
+            m_type = IndexedVersionType::VersionType::Beta;
             break;
         case 3:
-            m_type = IndexedVersionType::Enum::Alpha;
+            m_type = IndexedVersionType::VersionType::Alpha;
             break;
         default:
-            m_type = IndexedVersionType::Enum::UNKNOWN;
+            m_type = IndexedVersionType::VersionType::Unknown;
     }
 }
 
-IndexedVersionType::IndexedVersionType(const IndexedVersionType::Enum& type)
+IndexedVersionType::IndexedVersionType(const IndexedVersionType::VersionType& type)
 {
     m_type = type;
 }
@@ -63,24 +65,14 @@ IndexedVersionType& IndexedVersionType::operator=(const IndexedVersionType& othe
     return *this;
 }
 
-const QString IndexedVersionType::toString(const IndexedVersionType::Enum& type)
+const QString IndexedVersionType::toString(const IndexedVersionType::VersionType& type)
 {
-    switch (type) {
-        case IndexedVersionType::Enum::Release:
-            return "release";
-        case IndexedVersionType::Enum::Beta:
-            return "beta";
-        case IndexedVersionType::Enum::Alpha:
-            return "alpha";
-        case IndexedVersionType::Enum::UNKNOWN:
-        default:
-            return "unknown";
-    }
+    return s_indexed_version_type_names.key(type, "unknown");
 }
 
-IndexedVersionType::Enum IndexedVersionType::enumFromString(const QString& type)
+IndexedVersionType::VersionType IndexedVersionType::enumFromString(const QString& type)
 {
-    return s_indexed_version_type_names.value(type, IndexedVersionType::Enum::UNKNOWN);
+    return s_indexed_version_type_names.value(type, IndexedVersionType::VersionType::Unknown);
 }
 
 auto ProviderCapabilities::name(ResourceProvider p) -> const char*
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index e430f2b00..e56c282a2 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -57,32 +57,32 @@ struct DonationData {
 };
 
 struct IndexedVersionType {
-    enum class Enum { Release = 1, Beta, Alpha, UNKNOWN };
+    enum class VersionType { Release = 1, Beta, Alpha, Unknown };
     IndexedVersionType(const QString& type);
-    IndexedVersionType(int type);
-    IndexedVersionType(const IndexedVersionType::Enum& type);
+    IndexedVersionType(int flame_type);
+    IndexedVersionType(const IndexedVersionType::VersionType& type);
     IndexedVersionType(const IndexedVersionType& type);
-    IndexedVersionType() : IndexedVersionType(IndexedVersionType::Enum::UNKNOWN) {}
-    static const QString toString(const IndexedVersionType::Enum& type);
-    static IndexedVersionType::Enum enumFromString(const QString& type);
-    bool isValid() const { return m_type != IndexedVersionType::Enum::UNKNOWN; }
+    IndexedVersionType() : IndexedVersionType(IndexedVersionType::VersionType::Unknown) {}
+    static const QString toString(const IndexedVersionType::VersionType& type);
+    static IndexedVersionType::VersionType enumFromString(const QString& type);
+    bool isValid() const { return m_type != IndexedVersionType::VersionType::Unknown; }
     IndexedVersionType& operator=(const IndexedVersionType& other);
     bool operator==(const IndexedVersionType& other) const { return m_type == other.m_type; }
-    bool operator==(const IndexedVersionType::Enum& type) const { return m_type == type; }
+    bool operator==(const IndexedVersionType::VersionType& type) const { return m_type == type; }
     bool operator!=(const IndexedVersionType& other) const { return m_type != other.m_type; }
-    bool operator!=(const IndexedVersionType::Enum& type) const { return m_type != type; }
+    bool operator!=(const IndexedVersionType::VersionType& type) const { return m_type != type; }
     bool operator<(const IndexedVersionType& other) const { return m_type < other.m_type; }
-    bool operator<(const IndexedVersionType::Enum& type) const { return m_type < type; }
+    bool operator<(const IndexedVersionType::VersionType& type) const { return m_type < type; }
     bool operator<=(const IndexedVersionType& other) const { return m_type <= other.m_type; }
-    bool operator<=(const IndexedVersionType::Enum& type) const { return m_type <= type; }
+    bool operator<=(const IndexedVersionType::VersionType& type) const { return m_type <= type; }
     bool operator>(const IndexedVersionType& other) const { return m_type > other.m_type; }
-    bool operator>(const IndexedVersionType::Enum& type) const { return m_type > type; }
+    bool operator>(const IndexedVersionType::VersionType& type) const { return m_type > type; }
     bool operator>=(const IndexedVersionType& other) const { return m_type >= other.m_type; }
-    bool operator>=(const IndexedVersionType::Enum& type) const { return m_type >= type; }
+    bool operator>=(const IndexedVersionType::VersionType& type) const { return m_type >= type; }
 
     QString toString() const { return toString(m_type); }
 
-    IndexedVersionType::Enum m_type;
+    IndexedVersionType::VersionType m_type;
 };
 
 struct Dependency {
@@ -159,7 +159,6 @@ struct IndexedPack {
         return std::any_of(versions.constBegin(), versions.constEnd(), [](auto const& v) { return v.is_currently_selected; });
     }
 };
-QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 struct OverrideDep {
     QString quilt;
diff --git a/launcher/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index 5f642aceb..b2a12a67f 100644
--- a/launcher/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -6,8 +6,6 @@
 #include <QVector>
 #include "modplatform/ModIndex.h"
 
-#include "modplatform/ModIndex.h"
-
 namespace Flame {
 
 struct ModpackAuthor {

From 81a3ba18bc9740d543fe9aa569f74f37ec46c2cc Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed, 20 Sep 2023 18:45:23 +0300
Subject: [PATCH 16/35] Update
 launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
index 874391735..bd1fe9401 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
@@ -256,7 +256,7 @@ QHash<QString, QStringList> GetModDependenciesTask::getRequiredBy()
 {
     QHash<QString, QStringList> rby;
     auto fullList = m_selected + m_pack_dependencies;
-    for (auto mod : fullList) {
+    for (auto& mod : fullList) {
         auto addonId = mod->pack->addonId;
         auto provider = mod->pack->provider;
         auto version = mod->version.fileId;

From f3c089792a5342eeff93f032dca134fe371db4b3 Mon Sep 17 00:00:00 2001
From: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
Date: Fri, 22 Sep 2023 21:10:27 +0200
Subject: [PATCH 17/35] Skip folders when updating mods.

Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
---
 launcher/ui/dialogs/ModUpdateDialog.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 1f0fa7cd2..cd115bd3b 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -236,6 +236,11 @@ auto ModUpdateDialog::ensureMetadata() -> bool
         if (skip_rest)
             continue;
 
+        if (candidate->type() == ResourceType::FOLDER) {
+            m_failed_metadata.append({ candidate, tr("This is a folder.") });
+            continue;
+        }
+
         if (confirm_rest) {
             addToTmp(candidate, provider_rest);
             should_try_others.insert(candidate->internal_id(), try_others_rest);

From 14af7044be6bead9f29e3481d9c8760d738f317b Mon Sep 17 00:00:00 2001
From: bolli24 <9805065+bolli24@users.noreply.github.com>
Date: Sun, 24 Sep 2023 03:01:47 +0200
Subject: [PATCH 18/35] Update launcher/ui/dialogs/ModUpdateDialog.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>
---
 launcher/ui/dialogs/ModUpdateDialog.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index cd115bd3b..04173c88a 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -237,7 +237,6 @@ auto ModUpdateDialog::ensureMetadata() -> bool
             continue;
 
         if (candidate->type() == ResourceType::FOLDER) {
-            m_failed_metadata.append({ candidate, tr("This is a folder.") });
             continue;
         }
 

From 7c636d46080443357d10471b00406c549687ee11 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 25 Sep 2023 17:44:04 +0300
Subject: [PATCH 19/35] Removed mojang

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                       |  13 -
 launcher/minecraft/MinecraftInstance.cpp      |   3 -
 launcher/minecraft/auth/AccountData.cpp       | 121 +------
 launcher/minecraft/auth/AccountData.h         |  14 +-
 launcher/minecraft/auth/AccountList.cpp       |  50 +--
 launcher/minecraft/auth/AccountList.h         |   2 -
 launcher/minecraft/auth/AuthSession.h         |   4 -
 launcher/minecraft/auth/MinecraftAccount.cpp  |  40 +-
 launcher/minecraft/auth/MinecraftAccount.h    |  19 -
 launcher/minecraft/auth/Yggdrasil.cpp         | 342 ------------------
 launcher/minecraft/auth/Yggdrasil.h           |  92 -----
 launcher/minecraft/auth/flows/AuthFlow.h      |   1 -
 launcher/minecraft/auth/flows/Mojang.cpp      |  22 --
 launcher/minecraft/auth/flows/Mojang.h        |  17 -
 .../auth/steps/MigrationEligibilityStep.cpp   |  45 ---
 .../auth/steps/MigrationEligibilityStep.h     |  21 --
 .../auth/steps/MinecraftProfileStep.cpp       |   9 -
 .../auth/steps/MinecraftProfileStepMojang.cpp |  87 -----
 .../auth/steps/MinecraftProfileStepMojang.h   |  21 --
 .../minecraft/auth/steps/YggdrasilStep.cpp    |  57 ---
 launcher/minecraft/auth/steps/YggdrasilStep.h |  28 --
 launcher/ui/dialogs/LoginDialog.cpp           | 115 ------
 launcher/ui/dialogs/LoginDialog.h             |  56 ---
 launcher/ui/dialogs/LoginDialog.ui            |  77 ----
 launcher/ui/pages/global/AccountListPage.cpp  |  18 +-
 launcher/ui/pages/global/AccountListPage.h    |   1 -
 launcher/ui/pages/global/AccountListPage.ui   |   6 -
 27 files changed, 5 insertions(+), 1276 deletions(-)
 delete mode 100644 launcher/minecraft/auth/Yggdrasil.cpp
 delete mode 100644 launcher/minecraft/auth/Yggdrasil.h
 delete mode 100644 launcher/minecraft/auth/flows/Mojang.cpp
 delete mode 100644 launcher/minecraft/auth/flows/Mojang.h
 delete mode 100644 launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp
 delete mode 100644 launcher/minecraft/auth/steps/MigrationEligibilityStep.h
 delete mode 100644 launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
 delete mode 100644 launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h
 delete mode 100644 launcher/minecraft/auth/steps/YggdrasilStep.cpp
 delete mode 100644 launcher/minecraft/auth/steps/YggdrasilStep.h
 delete mode 100644 launcher/ui/dialogs/LoginDialog.cpp
 delete mode 100644 launcher/ui/dialogs/LoginDialog.h
 delete mode 100644 launcher/ui/dialogs/LoginDialog.ui

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 18e0acab1..de750afde 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -216,13 +216,9 @@ set(MINECRAFT_SOURCES
     minecraft/auth/MinecraftAccount.h
     minecraft/auth/Parsers.cpp
     minecraft/auth/Parsers.h
-    minecraft/auth/Yggdrasil.cpp
-    minecraft/auth/Yggdrasil.h
 
     minecraft/auth/flows/AuthFlow.cpp
     minecraft/auth/flows/AuthFlow.h
-    minecraft/auth/flows/Mojang.cpp
-    minecraft/auth/flows/Mojang.h
     minecraft/auth/flows/MSA.cpp
     minecraft/auth/flows/MSA.h
     minecraft/auth/flows/Offline.cpp
@@ -236,12 +232,8 @@ set(MINECRAFT_SOURCES
     minecraft/auth/steps/GetSkinStep.h
     minecraft/auth/steps/LauncherLoginStep.cpp
     minecraft/auth/steps/LauncherLoginStep.h
-    minecraft/auth/steps/MigrationEligibilityStep.cpp
-    minecraft/auth/steps/MigrationEligibilityStep.h
     minecraft/auth/steps/MinecraftProfileStep.cpp
     minecraft/auth/steps/MinecraftProfileStep.h
-    minecraft/auth/steps/MinecraftProfileStepMojang.cpp
-    minecraft/auth/steps/MinecraftProfileStepMojang.h
     minecraft/auth/steps/MSAStep.cpp
     minecraft/auth/steps/MSAStep.h
     minecraft/auth/steps/XboxAuthorizationStep.cpp
@@ -250,8 +242,6 @@ set(MINECRAFT_SOURCES
     minecraft/auth/steps/XboxProfileStep.h
     minecraft/auth/steps/XboxUserStep.cpp
     minecraft/auth/steps/XboxUserStep.h
-    minecraft/auth/steps/YggdrasilStep.cpp
-    minecraft/auth/steps/YggdrasilStep.h
 
     minecraft/gameoptions/GameOptions.h
     minecraft/gameoptions/GameOptions.cpp
@@ -944,8 +934,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
     ui/dialogs/ImportResourceDialog.h
-    ui/dialogs/LoginDialog.cpp
-    ui/dialogs/LoginDialog.h
     ui/dialogs/MSALoginDialog.cpp
     ui/dialogs/MSALoginDialog.h
     ui/dialogs/OfflineLoginDialog.cpp
@@ -1104,7 +1092,6 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/MSALoginDialog.ui
     ui/dialogs/OfflineLoginDialog.ui
     ui/dialogs/AboutDialog.ui
-    ui/dialogs/LoginDialog.ui
     ui/dialogs/EditAccountDialog.ui
     ui/dialogs/ReviewMessageBox.ui
     ui/dialogs/ScrollMessageBox.ui
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 0e64c46d4..57bbcd404 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -856,9 +856,6 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess
     if (sessionRef.access_token != "0") {
         addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
     }
-    if (sessionRef.client_token.size()) {
-        addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>"));
-    }
     addToFilter(sessionRef.uuid, tr("<PROFILE ID>"));
 
     return filter;
diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
index 474bf7c6e..e1f1e9b1e 100644
--- a/launcher/minecraft/auth/AccountData.cpp
+++ b/launcher/minecraft/auth/AccountData.cpp
@@ -278,67 +278,6 @@ bool entitlementFromJSONV3(const QJsonObject& parent, MinecraftEntitlement& out)
 
 }  // namespace
 
-bool AccountData::resumeStateFromV2(QJsonObject data)
-{
-    // The JSON object must at least have a username for it to be valid.
-    if (!data.value("username").isString()) {
-        qCritical() << "Can't load Mojang account info from JSON object. Username field is missing or of the wrong type.";
-        return false;
-    }
-
-    QString userName = data.value("username").toString("");
-    QString clientToken = data.value("clientToken").toString("");
-    QString accessToken = data.value("accessToken").toString("");
-
-    QJsonArray profileArray = data.value("profiles").toArray();
-    if (profileArray.size() < 1) {
-        qCritical() << "Can't load Mojang account with username \"" << userName << "\". No profiles found.";
-        return false;
-    }
-
-    struct AccountProfile {
-        QString id;
-        QString name;
-        bool legacy;
-    };
-
-    QList<AccountProfile> profiles;
-    int currentProfileIndex = 0;
-    int index = -1;
-    QString currentProfile = data.value("activeProfile").toString("");
-    for (QJsonValue profileVal : profileArray) {
-        index++;
-        QJsonObject profileObject = profileVal.toObject();
-        QString id = profileObject.value("id").toString("");
-        QString name = profileObject.value("name").toString("");
-        bool legacy_ = profileObject.value("legacy").toBool(false);
-        if (id.isEmpty() || name.isEmpty()) {
-            qWarning() << "Unable to load a profile" << name << "because it was missing an ID or a name.";
-            continue;
-        }
-        if (id == currentProfile) {
-            currentProfileIndex = index;
-        }
-        profiles.append({ id, name, legacy_ });
-    }
-    auto& profile = profiles[currentProfileIndex];
-
-    type = AccountType::Mojang;
-    legacy = profile.legacy;
-
-    minecraftProfile.id = profile.id;
-    minecraftProfile.name = profile.name;
-    minecraftProfile.validity = Katabasis::Validity::Assumed;
-
-    yggdrasilToken.token = accessToken;
-    yggdrasilToken.extra["clientToken"] = clientToken;
-    yggdrasilToken.extra["userName"] = userName;
-    yggdrasilToken.validity = Katabasis::Validity::Assumed;
-
-    validity_ = minecraftProfile.validity;
-    return true;
-}
-
 bool AccountData::resumeStateFromV3(QJsonObject data)
 {
     auto typeV = data.value("type");
@@ -349,8 +288,6 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
     auto typeS = typeV.toString();
     if (typeS == "MSA") {
         type = AccountType::MSA;
-    } else if (typeS == "Mojang") {
-        type = AccountType::Mojang;
     } else if (typeS == "Offline") {
         type = AccountType::Offline;
     } else {
@@ -358,11 +295,6 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
         return false;
     }
 
-    if (type == AccountType::Mojang) {
-        legacy = data.value("legacy").toBool(false);
-        canMigrateToMSA = data.value("canMigrateToMSA").toBool(false);
-    }
-
     if (type == AccountType::MSA) {
         auto clientIDV = data.value("msa-client-id");
         if (clientIDV.isString()) {
@@ -395,15 +327,7 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
 QJsonObject AccountData::saveState() const
 {
     QJsonObject output;
-    if (type == AccountType::Mojang) {
-        output["type"] = "Mojang";
-        if (legacy) {
-            output["legacy"] = true;
-        }
-        if (canMigrateToMSA) {
-            output["canMigrateToMSA"] = true;
-        }
-    } else if (type == AccountType::MSA) {
+    if (type == AccountType::MSA) {
         output["type"] = "MSA";
         output["msa-client-id"] = msaClientID;
         tokenToJSONV3(output, msaToken, "msa");
@@ -420,51 +344,11 @@ QJsonObject AccountData::saveState() const
     return output;
 }
 
-QString AccountData::userName() const
-{
-    if (type == AccountType::MSA) {
-        return QString();
-    }
-    return yggdrasilToken.extra["userName"].toString();
-}
-
 QString AccountData::accessToken() const
 {
     return yggdrasilToken.token;
 }
 
-QString AccountData::clientToken() const
-{
-    if (type != AccountType::Mojang) {
-        return QString();
-    }
-    return yggdrasilToken.extra["clientToken"].toString();
-}
-
-void AccountData::setClientToken(QString clientToken)
-{
-    if (type != AccountType::Mojang) {
-        return;
-    }
-    yggdrasilToken.extra["clientToken"] = clientToken;
-}
-
-void AccountData::generateClientTokenIfMissing()
-{
-    if (yggdrasilToken.extra.contains("clientToken")) {
-        return;
-    }
-    invalidateClientToken();
-}
-
-void AccountData::invalidateClientToken()
-{
-    if (type != AccountType::Mojang) {
-        return;
-    }
-    yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{-}]"));
-}
-
 QString AccountData::profileId() const
 {
     return minecraftProfile.id;
@@ -482,9 +366,6 @@ QString AccountData::profileName() const
 QString AccountData::accountDisplayString() const
 {
     switch (type) {
-        case AccountType::Mojang: {
-            return userName();
-        }
         case AccountType::Offline: {
             return QObject::tr("<Offline>");
         }
diff --git a/launcher/minecraft/auth/AccountData.h b/launcher/minecraft/auth/AccountData.h
index 9b626c34e..bac77e17f 100644
--- a/launcher/minecraft/auth/AccountData.h
+++ b/launcher/minecraft/auth/AccountData.h
@@ -71,27 +71,17 @@ struct MinecraftProfile {
     Katabasis::Validity validity = Katabasis::Validity::None;
 };
 
-enum class AccountType { MSA, Mojang, Offline };
+enum class AccountType { MSA, Offline };
 
 enum class AccountState { Unchecked, Offline, Working, Online, Disabled, Errored, Expired, Gone };
 
 struct AccountData {
     QJsonObject saveState() const;
-    bool resumeStateFromV2(QJsonObject data);
     bool resumeStateFromV3(QJsonObject data);
 
     //! userName for Mojang accounts, gamertag for MSA
     QString accountDisplayString() const;
 
-    //! Only valid for Mojang accounts. MSA does not preserve this information
-    QString userName() const;
-
-    //! Only valid for Mojang accounts.
-    QString clientToken() const;
-    void setClientToken(QString clientToken);
-    void invalidateClientToken();
-    void generateClientTokenIfMissing();
-
     //! Yggdrasil access token, as passed to the game.
     QString accessToken() const;
 
@@ -101,8 +91,6 @@ struct AccountData {
     QString lastError() const;
 
     AccountType type = AccountType::MSA;
-    bool legacy = false;
-    bool canMigrateToMSA = false;
 
     QString msaClientID;
     Katabasis::Token msaToken;
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index 84dbd8416..a29de4ecf 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -54,7 +54,7 @@
 
 #include <chrono>
 
-enum AccountListVersion { MojangOnly = 2, MojangMSA = 3 };
+enum AccountListVersion { MojangMSA = 3 };
 
 AccountList::AccountList(QObject* parent) : QAbstractListModel(parent)
 {
@@ -320,17 +320,6 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
                     }
                 }
 
-                case MigrationColumn: {
-                    if (account->isMSA() || account->isOffline()) {
-                        return tr("N/A", "Can Migrate");
-                    }
-                    if (account->canMigrate()) {
-                        return tr("Yes", "Can Migrate");
-                    } else {
-                        return tr("No", "Can Migrate");
-                    }
-                }
-
                 default:
                     return QVariant();
             }
@@ -366,8 +355,6 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
                     return tr("Type");
                 case StatusColumn:
                     return tr("Status");
-                case MigrationColumn:
-                    return tr("Can Migrate?");
                 default:
                     return QVariant();
             }
@@ -382,8 +369,6 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
                     return tr("Type of the account - Mojang or MSA.");
                 case StatusColumn:
                     return tr("Current status of the account.");
-                case MigrationColumn:
-                    return tr("Can this account migrate to a Microsoft account?");
                 default:
                     return QVariant();
             }
@@ -473,9 +458,6 @@ bool AccountList::loadList()
     // Make sure the format version matches.
     auto listVersion = root.value("formatVersion").toVariant().toInt();
     switch (listVersion) {
-        case AccountListVersion::MojangOnly: {
-            return loadV2(root);
-        } break;
         case AccountListVersion::MojangMSA: {
             return loadV3(root);
         } break;
@@ -489,36 +471,6 @@ bool AccountList::loadList()
     }
 }
 
-bool AccountList::loadV2(QJsonObject& root)
-{
-    beginResetModel();
-    auto defaultUserName = root.value("activeAccount").toString("");
-    QJsonArray accounts = root.value("accounts").toArray();
-    for (QJsonValue accountVal : accounts) {
-        QJsonObject accountObj = accountVal.toObject();
-        MinecraftAccountPtr account = MinecraftAccount::loadFromJsonV2(accountObj);
-        if (account.get() != nullptr) {
-            auto profileId = account->profileId();
-            if (!profileId.size()) {
-                continue;
-            }
-            if (findAccountByProfileId(profileId) != -1) {
-                continue;
-            }
-            connect(account.get(), &MinecraftAccount::changed, this, &AccountList::accountChanged);
-            connect(account.get(), &MinecraftAccount::activityChanged, this, &AccountList::accountActivityChanged);
-            m_accounts.append(account);
-            if (defaultUserName.size() && account->mojangUserName() == defaultUserName) {
-                m_defaultAccount = account;
-            }
-        } else {
-            qWarning() << "Failed to load an account.";
-        }
-    }
-    endResetModel();
-    return true;
-}
-
 bool AccountList::loadV3(QJsonObject& root)
 {
     beginResetModel();
diff --git a/launcher/minecraft/auth/AccountList.h b/launcher/minecraft/auth/AccountList.h
index 6a0b01916..051d8f958 100644
--- a/launcher/minecraft/auth/AccountList.h
+++ b/launcher/minecraft/auth/AccountList.h
@@ -55,7 +55,6 @@ class AccountList : public QAbstractListModel {
         // TODO: Add icon column.
         ProfileNameColumn = 0,
         NameColumn,
-        MigrationColumn,
         TypeColumn,
         StatusColumn,
 
@@ -97,7 +96,6 @@ class AccountList : public QAbstractListModel {
     void setListFilePath(QString path, bool autosave = false);
 
     bool loadList();
-    bool loadV2(QJsonObject& root);
     bool loadV3(QJsonObject& root);
     bool saveList();
 
diff --git a/launcher/minecraft/auth/AuthSession.h b/launcher/minecraft/auth/AuthSession.h
index 40519476d..074b2d6e3 100644
--- a/launcher/minecraft/auth/AuthSession.h
+++ b/launcher/minecraft/auth/AuthSession.h
@@ -24,10 +24,6 @@ struct AuthSession {
         GoneOrMigrated
     } status = Undetermined;
 
-    // client token
-    QString client_token;
-    // account user name
-    QString username;
     // combined session ID
     QString session;
     // volatile auth token
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index 6c2f0805f..545d06aed 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -51,7 +51,6 @@
 #include <QPainter>
 
 #include "flows/MSA.h"
-#include "flows/Mojang.h"
 #include "flows/Offline.h"
 
 MinecraftAccount::MinecraftAccount(QObject* parent) : QObject(parent)
@@ -59,15 +58,6 @@ MinecraftAccount::MinecraftAccount(QObject* parent) : QObject(parent)
     data.internalId = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
 }
 
-MinecraftAccountPtr MinecraftAccount::loadFromJsonV2(const QJsonObject& json)
-{
-    MinecraftAccountPtr account(new MinecraftAccount());
-    if (account->data.resumeStateFromV2(json)) {
-        return account;
-    }
-    return nullptr;
-}
-
 MinecraftAccountPtr MinecraftAccount::loadFromJsonV3(const QJsonObject& json)
 {
     MinecraftAccountPtr account(new MinecraftAccount());
@@ -77,15 +67,6 @@ MinecraftAccountPtr MinecraftAccount::loadFromJsonV3(const QJsonObject& json)
     return nullptr;
 }
 
-MinecraftAccountPtr MinecraftAccount::createFromUsername(const QString& username)
-{
-    auto account = makeShared<MinecraftAccount>();
-    account->data.type = AccountType::Mojang;
-    account->data.yggdrasilToken.extra["userName"] = username;
-    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
-    return account;
-}
-
 MinecraftAccountPtr MinecraftAccount::createBlankMSA()
 {
     MinecraftAccountPtr account(new MinecraftAccount());
@@ -138,18 +119,6 @@ QPixmap MinecraftAccount::getFace() const
     return skin.scaled(64, 64, Qt::KeepAspectRatio);
 }
 
-shared_qobject_ptr<AccountTask> MinecraftAccount::login(QString password)
-{
-    Q_ASSERT(m_currentTask.get() == nullptr);
-
-    m_currentTask.reset(new MojangLogin(&data, password));
-    connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
-    connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
-    connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });
-    emit activityChanged(true);
-    return m_currentTask;
-}
-
 shared_qobject_ptr<AccountTask> MinecraftAccount::loginMSA()
 {
     Q_ASSERT(m_currentTask.get() == nullptr);
@@ -182,10 +151,8 @@ shared_qobject_ptr<AccountTask> MinecraftAccount::refresh()
 
     if (data.type == AccountType::MSA) {
         m_currentTask.reset(new MSASilent(&data));
-    } else if (data.type == AccountType::Offline) {
-        m_currentTask.reset(new OfflineRefresh(&data));
     } else {
-        m_currentTask.reset(new MojangRefresh(&data));
+        m_currentTask.reset(new OfflineRefresh(&data));
     }
 
     connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
@@ -296,13 +263,8 @@ void MinecraftAccount::fillSession(AuthSessionPtr session)
         }
     }
 
-    // the user name. you have to have an user name
-    // FIXME: not with MSA
-    session->username = data.userName();
     // volatile auth token
     session->access_token = data.accessToken();
-    // the semi-permanent client token
-    session->client_token = data.clientToken();
     // profile name
     session->player_name = data.profileName();
     // profile ID
diff --git a/launcher/minecraft/auth/MinecraftAccount.h b/launcher/minecraft/auth/MinecraftAccount.h
index f04f947fa..910f4a28a 100644
--- a/launcher/minecraft/auth/MinecraftAccount.h
+++ b/launcher/minecraft/auth/MinecraftAccount.h
@@ -85,13 +85,10 @@ class MinecraftAccount : public QObject, public Usable {
     //! Default constructor
     explicit MinecraftAccount(QObject* parent = 0);
 
-    static MinecraftAccountPtr createFromUsername(const QString& username);
-
     static MinecraftAccountPtr createBlankMSA();
 
     static MinecraftAccountPtr createOffline(const QString& username);
 
-    static MinecraftAccountPtr loadFromJsonV2(const QJsonObject& json);
     static MinecraftAccountPtr loadFromJsonV3(const QJsonObject& json);
 
     static QUuid uuidFromUsername(QString username);
@@ -100,12 +97,6 @@ class MinecraftAccount : public QObject, public Usable {
     QJsonObject saveToJson() const;
 
    public: /* manipulation */
-    /**
-     * Attempt to login. Empty password means we use the token.
-     * If the attempt fails because we already are performing some task, it returns false.
-     */
-    shared_qobject_ptr<AccountTask> login(QString password);
-
     shared_qobject_ptr<AccountTask> loginMSA();
 
     shared_qobject_ptr<AccountTask> loginOffline();
@@ -119,8 +110,6 @@ class MinecraftAccount : public QObject, public Usable {
 
     QString accountDisplayString() const { return data.accountDisplayString(); }
 
-    QString mojangUserName() const { return data.userName(); }
-
     QString accessToken() const { return data.accessToken(); }
 
     QString profileId() const { return data.profileId(); }
@@ -129,8 +118,6 @@ class MinecraftAccount : public QObject, public Usable {
 
     bool isActive() const;
 
-    bool canMigrate() const { return data.canMigrateToMSA; }
-
     bool isMSA() const { return data.type == AccountType::MSA; }
 
     bool isOffline() const { return data.type == AccountType::Offline; }
@@ -142,12 +129,6 @@ class MinecraftAccount : public QObject, public Usable {
     QString typeString() const
     {
         switch (data.type) {
-            case AccountType::Mojang: {
-                if (data.legacy) {
-                    return "legacy";
-                }
-                return "mojang";
-            } break;
             case AccountType::MSA: {
                 return "msa";
             } break;
diff --git a/launcher/minecraft/auth/Yggdrasil.cpp b/launcher/minecraft/auth/Yggdrasil.cpp
deleted file mode 100644
index 97f2a78d4..000000000
--- a/launcher/minecraft/auth/Yggdrasil.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Yggdrasil.h"
-#include "AccountData.h"
-
-#include <QByteArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkReply>
-#include <QObject>
-#include <QString>
-
-#include <QDebug>
-
-#include "Application.h"
-
-Yggdrasil::Yggdrasil(AccountData* data, QObject* parent) : AccountTask(data, parent)
-{
-    changeState(AccountTaskState::STATE_CREATED);
-}
-
-void Yggdrasil::sendRequest(QUrl endpoint, QByteArray content)
-{
-    changeState(AccountTaskState::STATE_WORKING);
-
-    QNetworkRequest netRequest(endpoint);
-    netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    m_netReply = APPLICATION->network()->post(netRequest, content);
-    connect(m_netReply, &QNetworkReply::finished, this, &Yggdrasil::processReply);
-    connect(m_netReply, &QNetworkReply::uploadProgress, this, &Yggdrasil::refreshTimers);
-    connect(m_netReply, &QNetworkReply::downloadProgress, this, &Yggdrasil::refreshTimers);
-    connect(m_netReply, &QNetworkReply::sslErrors, this, &Yggdrasil::sslErrors);
-    timeout_keeper.setSingleShot(true);
-    timeout_keeper.start(timeout_max);
-    counter.setSingleShot(false);
-    counter.start(time_step);
-    progress(0, timeout_max);
-    connect(&timeout_keeper, &QTimer::timeout, this, &Yggdrasil::abortByTimeout);
-    connect(&counter, &QTimer::timeout, this, &Yggdrasil::heartbeat);
-}
-
-void Yggdrasil::executeTask() {}
-
-void Yggdrasil::refresh()
-{
-    start();
-    /*
-     * {
-     *  "clientToken": "client identifier"
-     *  "accessToken": "current access token to be refreshed"
-     *  "selectedProfile":                      // specifying this causes errors
-     *  {
-     *   "id": "profile ID"
-     *   "name": "profile name"
-     *  }
-     *  "requestUser": true/false               // request the user structure
-     * }
-     */
-    QJsonObject req;
-    req.insert("clientToken", m_data->clientToken());
-    req.insert("accessToken", m_data->accessToken());
-    /*
-    {
-        auto currentProfile = m_account->currentProfile();
-        QJsonObject profile;
-        profile.insert("id", currentProfile->id());
-        profile.insert("name", currentProfile->name());
-        req.insert("selectedProfile", profile);
-    }
-    */
-    req.insert("requestUser", false);
-    QJsonDocument doc(req);
-
-    QUrl reqUrl("https://authserver.mojang.com/refresh");
-    QByteArray requestData = doc.toJson();
-
-    sendRequest(reqUrl, requestData);
-}
-
-void Yggdrasil::login(QString password)
-{
-    start();
-    /*
-     * {
-     *   "agent": {                              // optional
-     *   "name": "Minecraft",                    // So far this is the only encountered value
-     *   "version": 1                            // This number might be increased
-     *                                           // by the vanilla client in the future
-     *   },
-     *   "username": "mojang account name",      // Can be an email address or player name for
-     *                                           // unmigrated accounts
-     *   "password": "mojang account password",
-     *   "clientToken": "client identifier",     // optional
-     *   "requestUser": true/false               // request the user structure
-     * }
-     */
-    QJsonObject req;
-
-    {
-        QJsonObject agent;
-        // C++ makes string literals void* for some stupid reason, so we have to tell it
-        // QString... Thanks Obama.
-        agent.insert("name", QString("Minecraft"));
-        agent.insert("version", 1);
-        req.insert("agent", agent);
-    }
-
-    req.insert("username", m_data->userName());
-    req.insert("password", password);
-    req.insert("requestUser", false);
-
-    // If we already have a client token, give it to the server.
-    // Otherwise, let the server give us one.
-
-    m_data->generateClientTokenIfMissing();
-    req.insert("clientToken", m_data->clientToken());
-
-    QJsonDocument doc(req);
-
-    QUrl reqUrl("https://authserver.mojang.com/authenticate");
-    QNetworkRequest netRequest(reqUrl);
-    QByteArray requestData = doc.toJson();
-
-    sendRequest(reqUrl, requestData);
-}
-
-void Yggdrasil::refreshTimers(qint64, qint64)
-{
-    timeout_keeper.stop();
-    timeout_keeper.start(timeout_max);
-    progress(count = 0, timeout_max);
-}
-
-void Yggdrasil::heartbeat()
-{
-    count += time_step;
-    progress(count, timeout_max);
-}
-
-bool Yggdrasil::abort()
-{
-    progress(timeout_max, timeout_max);
-    // TODO: actually use this in a meaningful way
-    m_aborted = Yggdrasil::BY_USER;
-    m_netReply->abort();
-    return true;
-}
-
-void Yggdrasil::abortByTimeout()
-{
-    progress(timeout_max, timeout_max);
-    // TODO: actually use this in a meaningful way
-    m_aborted = Yggdrasil::BY_TIMEOUT;
-    m_netReply->abort();
-}
-
-void Yggdrasil::sslErrors(QList<QSslError> errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCritical() << "LOGIN SSL Error #" << i << " : " << error.errorString();
-        auto cert = error.certificate();
-        qCritical() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-void Yggdrasil::processResponse(QJsonObject responseData)
-{
-    // Read the response data. We need to get the client token, access token, and the selected
-    // profile.
-    qDebug() << "Processing authentication response.";
-
-    // qDebug() << responseData;
-    // If we already have a client token, make sure the one the server gave us matches our
-    // existing one.
-    QString clientToken = responseData.value("clientToken").toString("");
-    if (clientToken.isEmpty()) {
-        // Fail if the server gave us an empty client token
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a client token."));
-        return;
-    }
-    if (m_data->clientToken().isEmpty()) {
-        m_data->setClientToken(clientToken);
-    } else if (clientToken != m_data->clientToken()) {
-        changeState(AccountTaskState::STATE_FAILED_HARD,
-                    tr("Authentication server attempted to change the client token. This isn't supported."));
-        return;
-    }
-
-    // Now, we set the access token.
-    qDebug() << "Getting access token.";
-    QString accessToken = responseData.value("accessToken").toString("");
-    if (accessToken.isEmpty()) {
-        // Fail if the server didn't give us an access token.
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send an access token."));
-        return;
-    }
-    // Set the access token.
-    m_data->yggdrasilToken.token = accessToken;
-    m_data->yggdrasilToken.validity = Katabasis::Validity::Certain;
-    m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
-
-    // Get UUID here since we need it for later
-    auto profile = responseData.value("selectedProfile");
-    if (!profile.isObject()) {
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a selected profile."));
-        return;
-    }
-
-    auto profileObj = profile.toObject();
-    for (auto i = profileObj.constBegin(); i != profileObj.constEnd(); ++i) {
-        if (i.key() == "name" && i.value().isString()) {
-            m_data->minecraftProfile.name = i->toString();
-        } else if (i.key() == "id" && i.value().isString()) {
-            m_data->minecraftProfile.id = i->toString();
-        }
-    }
-
-    if (m_data->minecraftProfile.id.isEmpty()) {
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a UUID in selected profile."));
-        return;
-    }
-
-    // We've made it through the minefield of possible errors. Return true to indicate that
-    // we've succeeded.
-    qDebug() << "Finished reading authentication response.";
-    changeState(AccountTaskState::STATE_SUCCEEDED);
-}
-
-void Yggdrasil::processReply()
-{
-    changeState(AccountTaskState::STATE_WORKING);
-
-    switch (m_netReply->error()) {
-        case QNetworkReply::NoError:
-            break;
-        case QNetworkReply::TimeoutError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation timed out."));
-            return;
-        case QNetworkReply::OperationCanceledError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation cancelled."));
-            return;
-        case QNetworkReply::SslHandshakeFailedError:
-            changeState(AccountTaskState::STATE_FAILED_SOFT,
-                        tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
-                           "<ul>"
-                           "<li>You use Windows and need to update your root certificates, please install any outstanding updates.</li>"
-                           "<li>Some device on your network is interfering with SSL traffic. In that case, "
-                           "you have bigger worries than Minecraft not starting.</li>"
-                           "<li>Possibly something else. Check the log file for details</li>"
-                           "</ul>"));
-            return;
-        // used for invalid credentials and similar errors. Fall through.
-        case QNetworkReply::ContentAccessDenied:
-        case QNetworkReply::ContentOperationNotPermittedError:
-            break;
-        case QNetworkReply::ContentGoneError: {
-            changeState(AccountTaskState::STATE_FAILED_GONE,
-                        tr("The Mojang account no longer exists. It may have been migrated to a Microsoft account."));
-            return;
-        }
-        default:
-            changeState(AccountTaskState::STATE_FAILED_SOFT, tr("Authentication operation failed due to a network error: %1 (%2)")
-                                                                 .arg(m_netReply->errorString())
-                                                                 .arg(m_netReply->error()));
-            return;
-    }
-
-    // Try to parse the response regardless of the response code.
-    // Sometimes the auth server will give more information and an error code.
-    QJsonParseError jsonError;
-    QByteArray replyData = m_netReply->readAll();
-    QJsonDocument doc = QJsonDocument::fromJson(replyData, &jsonError);
-    // Check the response code.
-    int responseCode = m_netReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-
-    if (responseCode == 200) {
-        // If the response code was 200, then there shouldn't be an error. Make sure
-        // anyways.
-        // Also, sometimes an empty reply indicates success. If there was no data received,
-        // pass an empty json object to the processResponse function.
-        if (jsonError.error == QJsonParseError::NoError || replyData.size() == 0) {
-            processResponse(replyData.size() > 0 ? doc.object() : QJsonObject());
-            return;
-        } else {
-            changeState(AccountTaskState::STATE_FAILED_SOFT,
-                        tr("Failed to parse authentication server response JSON response: %1 at offset %2.")
-                            .arg(jsonError.errorString())
-                            .arg(jsonError.offset));
-            qCritical() << replyData;
-        }
-        return;
-    }
-
-    // If the response code was not 200, then Yggdrasil may have given us information
-    // about the error.
-    // If we can parse the response, then get information from it. Otherwise just say
-    // there was an unknown error.
-    if (jsonError.error == QJsonParseError::NoError) {
-        // We were able to parse the server's response. Woo!
-        // Call processError. If a subclass has overridden it then they'll handle their
-        // stuff there.
-        qDebug() << "The request failed, but the server gave us an error message. Processing error.";
-        processError(doc.object());
-    } else {
-        // The server didn't say anything regarding the error. Give the user an unknown
-        // error.
-        qDebug() << "The request failed and the server gave no error message. Unknown error.";
-        changeState(
-            AccountTaskState::STATE_FAILED_SOFT,
-            tr("An unknown error occurred when trying to communicate with the authentication server: %1").arg(m_netReply->errorString()));
-    }
-}
-
-void Yggdrasil::processError(QJsonObject responseData)
-{
-    QJsonValue errorVal = responseData.value("error");
-    QJsonValue errorMessageValue = responseData.value("errorMessage");
-    QJsonValue causeVal = responseData.value("cause");
-
-    if (errorVal.isString() && errorMessageValue.isString()) {
-        m_error = std::shared_ptr<Error>(new Error{ errorVal.toString(""), errorMessageValue.toString(""), causeVal.toString("") });
-        changeState(AccountTaskState::STATE_FAILED_HARD, m_error->m_errorMessageVerbose);
-    } else {
-        // Error is not in standard format. Don't set m_error and return unknown error.
-        changeState(AccountTaskState::STATE_FAILED_HARD, tr("An unknown Yggdrasil error occurred."));
-    }
-}
diff --git a/launcher/minecraft/auth/Yggdrasil.h b/launcher/minecraft/auth/Yggdrasil.h
deleted file mode 100644
index 560d7fb81..000000000
--- a/launcher/minecraft/auth/Yggdrasil.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "AccountTask.h"
-
-#include <qsslerror.h>
-#include <QJsonObject>
-#include <QString>
-#include <QTimer>
-
-#include "MinecraftAccount.h"
-
-class QNetworkAccessManager;
-class QNetworkReply;
-
-/**
- * A Yggdrasil task is a task that performs an operation on a given mojang account.
- */
-class Yggdrasil : public AccountTask {
-    Q_OBJECT
-   public:
-    explicit Yggdrasil(AccountData* data, QObject* parent = 0);
-    virtual ~Yggdrasil() = default;
-
-    void refresh();
-    void login(QString password);
-
-    struct Error {
-        QString m_errorMessageShort;
-        QString m_errorMessageVerbose;
-        QString m_cause;
-    };
-    std::shared_ptr<Error> m_error;
-
-    enum AbortedBy { BY_NOTHING, BY_USER, BY_TIMEOUT } m_aborted = BY_NOTHING;
-
-   protected:
-    void executeTask() override;
-
-    /**
-     * Processes the response received from the server.
-     * If an error occurred, this should emit a failed signal.
-     * If Yggdrasil gave an error response, it should call setError() first, and then return false.
-     * Otherwise, it should return true.
-     * Note: If the response from the server was blank, and the HTTP code was 200, this function is called with
-     * an empty QJsonObject.
-     */
-    void processResponse(QJsonObject responseData);
-
-    /**
-     * Processes an error response received from the server.
-     * The default implementation will read data from Yggdrasil's standard error response format and set it as this task's Error.
-     * \returns a QString error message that will be passed to emitFailed.
-     */
-    virtual void processError(QJsonObject responseData);
-
-   protected slots:
-    void processReply();
-    void refreshTimers(qint64, qint64);
-    void heartbeat();
-    void sslErrors(QList<QSslError>);
-    void abortByTimeout();
-
-   public slots:
-    virtual bool abort() override;
-
-   private:
-    void sendRequest(QUrl endpoint, QByteArray content);
-
-   protected:
-    QNetworkReply* m_netReply = nullptr;
-    QTimer timeout_keeper;
-    QTimer counter;
-    int count = 0;  // num msec since time reset
-
-    const int timeout_max = 30000;
-    const int time_step = 50;
-};
diff --git a/launcher/minecraft/auth/flows/AuthFlow.h b/launcher/minecraft/auth/flows/AuthFlow.h
index c2c412abc..e39e926dd 100644
--- a/launcher/minecraft/auth/flows/AuthFlow.h
+++ b/launcher/minecraft/auth/flows/AuthFlow.h
@@ -12,7 +12,6 @@
 #include "minecraft/auth/AccountData.h"
 #include "minecraft/auth/AccountTask.h"
 #include "minecraft/auth/AuthStep.h"
-#include "minecraft/auth/Yggdrasil.h"
 
 class AuthFlow : public AccountTask {
     Q_OBJECT
diff --git a/launcher/minecraft/auth/flows/Mojang.cpp b/launcher/minecraft/auth/flows/Mojang.cpp
deleted file mode 100644
index 7e2db16fa..000000000
--- a/launcher/minecraft/auth/flows/Mojang.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "Mojang.h"
-
-#include "minecraft/auth/steps/GetSkinStep.h"
-#include "minecraft/auth/steps/MigrationEligibilityStep.h"
-#include "minecraft/auth/steps/MinecraftProfileStepMojang.h"
-#include "minecraft/auth/steps/YggdrasilStep.h"
-
-MojangRefresh::MojangRefresh(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
-
-MojangLogin::MojangLogin(AccountData* data, QString password, QObject* parent) : AuthFlow(data, parent), m_password(password)
-{
-    m_steps.append(makeShared<YggdrasilStep>(m_data, m_password));
-    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
-    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
-    m_steps.append(makeShared<GetSkinStep>(m_data));
-}
diff --git a/launcher/minecraft/auth/flows/Mojang.h b/launcher/minecraft/auth/flows/Mojang.h
deleted file mode 100644
index 779ca7e34..000000000
--- a/launcher/minecraft/auth/flows/Mojang.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "AuthFlow.h"
-
-class MojangRefresh : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MojangRefresh(AccountData* data, QObject* parent = 0);
-};
-
-class MojangLogin : public AuthFlow {
-    Q_OBJECT
-   public:
-    explicit MojangLogin(AccountData* data, QString password, QObject* parent = 0);
-
-   private:
-    QString m_password;
-};
diff --git a/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp b/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp
deleted file mode 100644
index 5ce953dfb..000000000
--- a/launcher/minecraft/auth/steps/MigrationEligibilityStep.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "MigrationEligibilityStep.h"
-
-#include <QNetworkRequest>
-
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-
-MigrationEligibilityStep::MigrationEligibilityStep(AccountData* data) : AuthStep(data) {}
-
-MigrationEligibilityStep::~MigrationEligibilityStep() noexcept = default;
-
-QString MigrationEligibilityStep::describe()
-{
-    return tr("Checking for migration eligibility.");
-}
-
-void MigrationEligibilityStep::perform()
-{
-    auto url = QUrl("https://api.minecraftservices.com/rollout/v1/msamigration");
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());
-
-    AuthRequest* requestor = new AuthRequest(this);
-    connect(requestor, &AuthRequest::finished, this, &MigrationEligibilityStep::onRequestDone);
-    requestor->get(request);
-}
-
-void MigrationEligibilityStep::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
-void MigrationEligibilityStep::onRequestDone(QNetworkReply::NetworkError error,
-                                             QByteArray data,
-                                             QList<QNetworkReply::RawHeaderPair> headers)
-{
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    if (error == QNetworkReply::NoError) {
-        Parsers::parseRolloutResponse(data, m_data->canMigrateToMSA);
-    }
-    emit finished(AccountTaskState::STATE_WORKING, tr("Got migration flags"));
-}
diff --git a/launcher/minecraft/auth/steps/MigrationEligibilityStep.h b/launcher/minecraft/auth/steps/MigrationEligibilityStep.h
deleted file mode 100644
index 8638975d8..000000000
--- a/launcher/minecraft/auth/steps/MigrationEligibilityStep.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-class MigrationEligibilityStep : public AuthStep {
-    Q_OBJECT
-
-   public:
-    explicit MigrationEligibilityStep(AccountData* data);
-    virtual ~MigrationEligibilityStep() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-
-   private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
-};
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
index 7cdce23f0..a854342bc 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
@@ -41,10 +41,6 @@ void MinecraftProfileStep::onRequestDone(QNetworkReply::NetworkError error, QByt
     qCDebug(authCredentials()) << data;
     if (error == QNetworkReply::ContentNotFoundError) {
         // NOTE: Succeed even if we do not have a profile. This is a valid account state.
-        if (m_data->type == AccountType::Mojang) {
-            m_data->minecraftEntitlement.canPlayMinecraft = false;
-            m_data->minecraftEntitlement.ownsMinecraft = false;
-        }
         m_data->minecraftProfile = MinecraftProfile();
         emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Account has no Minecraft profile."));
         return;
@@ -73,10 +69,5 @@ void MinecraftProfileStep::onRequestDone(QNetworkReply::NetworkError error, QByt
         return;
     }
 
-    if (m_data->type == AccountType::Mojang) {
-        auto validProfile = m_data->minecraftProfile.validity == Katabasis::Validity::Certain;
-        m_data->minecraftEntitlement.canPlayMinecraft = validProfile;
-        m_data->minecraftEntitlement.ownsMinecraft = validProfile;
-    }
     emit finished(AccountTaskState::STATE_WORKING, tr("Minecraft Java profile acquisition succeeded."));
 }
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
deleted file mode 100644
index d035e39a0..000000000
--- a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "MinecraftProfileStepMojang.h"
-
-#include <QNetworkRequest>
-
-#include "Logging.h"
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-#include "net/NetUtils.h"
-
-MinecraftProfileStepMojang::MinecraftProfileStepMojang(AccountData* data) : AuthStep(data) {}
-
-MinecraftProfileStepMojang::~MinecraftProfileStepMojang() noexcept = default;
-
-QString MinecraftProfileStepMojang::describe()
-{
-    return tr("Fetching the Minecraft profile.");
-}
-
-void MinecraftProfileStepMojang::perform()
-{
-    if (m_data->minecraftProfile.id.isEmpty()) {
-        emit finished(AccountTaskState::STATE_FAILED_HARD, tr("A UUID is required to get the profile."));
-        return;
-    }
-
-    // use session server instead of profile due to profile endpoint being locked for locked Mojang accounts
-    QUrl url = QUrl("https://sessionserver.mojang.com/session/minecraft/profile/" + m_data->minecraftProfile.id);
-    QNetworkRequest req = QNetworkRequest(url);
-    AuthRequest* request = new AuthRequest(this);
-    connect(request, &AuthRequest::finished, this, &MinecraftProfileStepMojang::onRequestDone);
-    request->get(req);
-}
-
-void MinecraftProfileStepMojang::rehydrate()
-{
-    // NOOP, for now. We only save bools and there's nothing to check.
-}
-
-void MinecraftProfileStepMojang::onRequestDone(QNetworkReply::NetworkError error,
-                                               QByteArray data,
-                                               QList<QNetworkReply::RawHeaderPair> headers)
-{
-    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
-    requestor->deleteLater();
-
-    qCDebug(authCredentials()) << data;
-    if (error == QNetworkReply::ContentNotFoundError) {
-        // NOTE: Succeed even if we do not have a profile. This is a valid account state.
-        if (m_data->type == AccountType::Mojang) {
-            m_data->minecraftEntitlement.canPlayMinecraft = false;
-            m_data->minecraftEntitlement.ownsMinecraft = false;
-        }
-        m_data->minecraftProfile = MinecraftProfile();
-        emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Account has no Minecraft profile."));
-        return;
-    }
-    if (error != QNetworkReply::NoError) {
-        qWarning() << "Error getting profile:";
-        qWarning() << " HTTP Status:        " << requestor->httpStatus_;
-        qWarning() << " Internal error no.: " << error;
-        qWarning() << " Error string:       " << requestor->errorString_;
-
-        qWarning() << " Response:";
-        qWarning() << QString::fromUtf8(data);
-
-        if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
-        } else {
-            emit finished(AccountTaskState::STATE_OFFLINE,
-                          tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
-        }
-        return;
-    }
-    if (!Parsers::parseMinecraftProfileMojang(data, m_data->minecraftProfile)) {
-        m_data->minecraftProfile = MinecraftProfile();
-        emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Minecraft Java profile response could not be parsed"));
-        return;
-    }
-
-    if (m_data->type == AccountType::Mojang) {
-        auto validProfile = m_data->minecraftProfile.validity == Katabasis::Validity::Certain;
-        m_data->minecraftEntitlement.canPlayMinecraft = validProfile;
-        m_data->minecraftEntitlement.ownsMinecraft = validProfile;
-    }
-    emit finished(AccountTaskState::STATE_WORKING, tr("Minecraft Java profile acquisition succeeded."));
-}
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h b/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h
deleted file mode 100644
index 730ec3f68..000000000
--- a/launcher/minecraft/auth/steps/MinecraftProfileStepMojang.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-class MinecraftProfileStepMojang : public AuthStep {
-    Q_OBJECT
-
-   public:
-    explicit MinecraftProfileStepMojang(AccountData* data);
-    virtual ~MinecraftProfileStepMojang() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-
-   private slots:
-    void onRequestDone(QNetworkReply::NetworkError, QByteArray, QList<QNetworkReply::RawHeaderPair>);
-};
diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.cpp b/launcher/minecraft/auth/steps/YggdrasilStep.cpp
deleted file mode 100644
index fdcaa0d67..000000000
--- a/launcher/minecraft/auth/steps/YggdrasilStep.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "YggdrasilStep.h"
-
-#include "minecraft/auth/AuthRequest.h"
-#include "minecraft/auth/Parsers.h"
-#include "minecraft/auth/Yggdrasil.h"
-
-YggdrasilStep::YggdrasilStep(AccountData* data, QString password) : AuthStep(data), m_password(password)
-{
-    m_yggdrasil = new Yggdrasil(m_data, this);
-
-    connect(m_yggdrasil, &Task::failed, this, &YggdrasilStep::onAuthFailed);
-    connect(m_yggdrasil, &Task::succeeded, this, &YggdrasilStep::onAuthSucceeded);
-    connect(m_yggdrasil, &Task::aborted, this, &YggdrasilStep::onAuthFailed);
-}
-
-YggdrasilStep::~YggdrasilStep() noexcept = default;
-
-QString YggdrasilStep::describe()
-{
-    return tr("Logging in with Mojang account.");
-}
-
-void YggdrasilStep::rehydrate()
-{
-    // NOOP, for now.
-}
-
-void YggdrasilStep::perform()
-{
-    if (m_password.size()) {
-        m_yggdrasil->login(m_password);
-    } else {
-        m_yggdrasil->refresh();
-    }
-}
-
-void YggdrasilStep::onAuthSucceeded()
-{
-    emit finished(AccountTaskState::STATE_WORKING, tr("Logged in with Mojang"));
-}
-
-void YggdrasilStep::onAuthFailed()
-{
-    // TODO: hook these in again, expand to MSA
-    // m_error = m_yggdrasil->m_error;
-    // m_aborted = m_yggdrasil->m_aborted;
-
-    auto state = m_yggdrasil->taskState();
-    QString errorMessage = tr("Mojang user authentication failed.");
-
-    // NOTE: soft error in the first step means 'offline'
-    if (state == AccountTaskState::STATE_FAILED_SOFT) {
-        state = AccountTaskState::STATE_OFFLINE;
-        errorMessage = tr("Mojang user authentication ended with a network error.");
-    }
-    emit finished(state, errorMessage);
-}
diff --git a/launcher/minecraft/auth/steps/YggdrasilStep.h b/launcher/minecraft/auth/steps/YggdrasilStep.h
deleted file mode 100644
index ef31f34d5..000000000
--- a/launcher/minecraft/auth/steps/YggdrasilStep.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <QObject>
-
-#include "QObjectPtr.h"
-#include "minecraft/auth/AuthStep.h"
-
-class Yggdrasil;
-
-class YggdrasilStep : public AuthStep {
-    Q_OBJECT
-
-   public:
-    explicit YggdrasilStep(AccountData* data, QString password);
-    virtual ~YggdrasilStep() noexcept;
-
-    void perform() override;
-    void rehydrate() override;
-
-    QString describe() override;
-
-   private slots:
-    void onAuthSucceeded();
-    void onAuthFailed();
-
-   private:
-    Yggdrasil* m_yggdrasil = nullptr;
-    QString m_password;
-};
diff --git a/launcher/ui/dialogs/LoginDialog.cpp b/launcher/ui/dialogs/LoginDialog.cpp
deleted file mode 100644
index 7296a13ef..000000000
--- a/launcher/ui/dialogs/LoginDialog.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LoginDialog.h"
-#include "ui_LoginDialog.h"
-
-#include "minecraft/auth/AccountTask.h"
-
-#include <QtWidgets/QPushButton>
-
-LoginDialog::LoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::LoginDialog)
-{
-    ui->setupUi(this);
-    ui->progressBar->setVisible(false);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-LoginDialog::~LoginDialog()
-{
-    delete ui;
-}
-
-// Stage 1: User interaction
-void LoginDialog::accept()
-{
-    setUserInputsEnabled(false);
-    ui->progressBar->setVisible(true);
-
-    // Setup the login task and start it
-    m_account = MinecraftAccount::createFromUsername(ui->userTextBox->text());
-    m_loginTask = m_account->login(ui->passTextBox->text());
-    connect(m_loginTask.get(), &Task::failed, this, &LoginDialog::onTaskFailed);
-    connect(m_loginTask.get(), &Task::succeeded, this, &LoginDialog::onTaskSucceeded);
-    connect(m_loginTask.get(), &Task::status, this, &LoginDialog::onTaskStatus);
-    connect(m_loginTask.get(), &Task::progress, this, &LoginDialog::onTaskProgress);
-    m_loginTask->start();
-}
-
-void LoginDialog::setUserInputsEnabled(bool enable)
-{
-    ui->userTextBox->setEnabled(enable);
-    ui->passTextBox->setEnabled(enable);
-    ui->buttonBox->setEnabled(enable);
-}
-
-// Enable the OK button only when both textboxes contain something.
-void LoginDialog::on_userTextBox_textEdited(const QString& newText)
-{
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->passTextBox->text().isEmpty());
-}
-void LoginDialog::on_passTextBox_textEdited(const QString& newText)
-{
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!newText.isEmpty() && !ui->userTextBox->text().isEmpty());
-}
-
-void LoginDialog::onTaskFailed(const QString& reason)
-{
-    // Set message
-    auto lines = reason.split('\n');
-    QString processed;
-    for (auto line : lines) {
-        if (line.size()) {
-            processed += "<font color='red'>" + line + "</font><br />";
-        } else {
-            processed += "<br />";
-        }
-    }
-    ui->label->setText(processed);
-
-    // Re-enable user-interaction
-    setUserInputsEnabled(true);
-    ui->progressBar->setVisible(false);
-}
-
-void LoginDialog::onTaskSucceeded()
-{
-    QDialog::accept();
-}
-
-void LoginDialog::onTaskStatus(const QString& status)
-{
-    ui->label->setText(status);
-}
-
-void LoginDialog::onTaskProgress(qint64 current, qint64 total)
-{
-    ui->progressBar->setMaximum(total);
-    ui->progressBar->setValue(current);
-}
-
-// Public interface
-MinecraftAccountPtr LoginDialog::newAccount(QWidget* parent, QString msg)
-{
-    LoginDialog dlg(parent);
-    dlg.ui->label->setText(msg);
-    if (dlg.exec() == QDialog::Accepted) {
-        return dlg.m_account;
-    }
-    return nullptr;
-}
diff --git a/launcher/ui/dialogs/LoginDialog.h b/launcher/ui/dialogs/LoginDialog.h
deleted file mode 100644
index 601b5fa77..000000000
--- a/launcher/ui/dialogs/LoginDialog.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QtCore/QEventLoop>
-#include <QtWidgets/QDialog>
-
-#include "minecraft/auth/MinecraftAccount.h"
-#include "tasks/Task.h"
-
-namespace Ui {
-class LoginDialog;
-}
-
-class LoginDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    ~LoginDialog();
-
-    static MinecraftAccountPtr newAccount(QWidget* parent, QString message);
-
-   private:
-    explicit LoginDialog(QWidget* parent = 0);
-
-    void setUserInputsEnabled(bool enable);
-
-   protected slots:
-    void accept();
-
-    void onTaskFailed(const QString& reason);
-    void onTaskSucceeded();
-    void onTaskStatus(const QString& status);
-    void onTaskProgress(qint64 current, qint64 total);
-
-    void on_userTextBox_textEdited(const QString& newText);
-    void on_passTextBox_textEdited(const QString& newText);
-
-   private:
-    Ui::LoginDialog* ui;
-    MinecraftAccountPtr m_account;
-    Task::Ptr m_loginTask;
-};
diff --git a/launcher/ui/dialogs/LoginDialog.ui b/launcher/ui/dialogs/LoginDialog.ui
deleted file mode 100644
index 8fa4a45d2..000000000
--- a/launcher/ui/dialogs/LoginDialog.ui
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LoginDialog</class>
- <widget class="QDialog" name="LoginDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>421</width>
-    <height>198</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Add Account</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string notr="true">Message label placeholder.</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="userTextBox">
-     <property name="placeholderText">
-      <string>Email</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="passTextBox">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-     <property name="placeholderText">
-      <string>Password</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="textVisible">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index c95bfabdd..90591c7f6 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -45,7 +45,6 @@
 #include "net/NetJob.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/LoginDialog.h"
 #include "ui/dialogs/MSALoginDialog.h"
 #include "ui/dialogs/OfflineLoginDialog.h"
 #include "ui/dialogs/ProgressDialog.h"
@@ -64,8 +63,7 @@ AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new
     ui->setupUi(this);
     ui->listView->setEmptyString(
         tr("Welcome!\n"
-           "If you're new here, you can select the \"Add Microsoft\" or \"Add Mojang\" buttons to link your Microsoft and/or Mojang "
-           "accounts."));
+           "If you're new here, you can select the \"Add Microsoft\" button to link your Microsoft account."));
     ui->listView->setEmptyMode(VersionListView::String);
     ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -74,7 +72,6 @@ AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new
     ui->listView->setModel(m_accounts.get());
     ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::ProfileNameColumn, QHeaderView::Stretch);
     ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::NameColumn, QHeaderView::Stretch);
-    ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::MigrationColumn, QHeaderView::ResizeToContents);
     ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::TypeColumn, QHeaderView::ResizeToContents);
     ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::StatusColumn, QHeaderView::ResizeToContents);
     ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -139,19 +136,6 @@ void AccountListPage::listChanged()
     updateButtonStates();
 }
 
-void AccountListPage::on_actionAddMojang_triggered()
-{
-    MinecraftAccountPtr account =
-        LoginDialog::newAccount(this, tr("Please enter your Mojang account email and password to add your account."));
-
-    if (account) {
-        m_accounts->addAccount(account);
-        if (m_accounts->count() == 1) {
-            m_accounts->setDefaultAccount(account);
-        }
-    }
-}
-
 void AccountListPage::on_actionAddMicrosoft_triggered()
 {
     MinecraftAccountPtr account =
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index add0f4aa0..f3b80191d 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -70,7 +70,6 @@ class AccountListPage : public QMainWindow, public BasePage {
     void retranslate() override;
 
    public slots:
-    void on_actionAddMojang_triggered();
     void on_actionAddMicrosoft_triggered();
     void on_actionAddOffline_triggered();
     void on_actionRemove_triggered();
diff --git a/launcher/ui/pages/global/AccountListPage.ui b/launcher/ui/pages/global/AccountListPage.ui
index 469955b51..d8cf3ac0a 100644
--- a/launcher/ui/pages/global/AccountListPage.ui
+++ b/launcher/ui/pages/global/AccountListPage.ui
@@ -53,7 +53,6 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionAddMicrosoft"/>
-   <addaction name="actionAddMojang"/>
    <addaction name="actionAddOffline"/>
    <addaction name="actionRefresh"/>
    <addaction name="actionRemove"/>
@@ -63,11 +62,6 @@
    <addaction name="actionUploadSkin"/>
    <addaction name="actionDeleteSkin"/>
   </widget>
-  <action name="actionAddMojang">
-   <property name="text">
-    <string>Add &amp;Mojang</string>
-   </property>
-  </action>
   <action name="actionRemove">
    <property name="text">
     <string>Remo&amp;ve</string>

From 86b47b3421101083a5d0a93a11d33f35c3f8f4a2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 25 Sep 2023 22:33:36 +0300
Subject: [PATCH 20/35] Do not display invalid shaders

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/ShaderPack.cpp          |  7 ++++++-
 launcher/minecraft/mod/ShaderPack.h            |  1 +
 launcher/minecraft/mod/ShaderPackFolderModel.h | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/launcher/minecraft/mod/ShaderPack.cpp b/launcher/minecraft/mod/ShaderPack.cpp
index 6a9641de2..2c094f26a 100644
--- a/launcher/minecraft/mod/ShaderPack.cpp
+++ b/launcher/minecraft/mod/ShaderPack.cpp
@@ -22,7 +22,7 @@
 
 #include "ShaderPack.h"
 
-#include "minecraft/mod/tasks/LocalShaderPackParseTask.h"
+#include <QRegularExpression>
 
 void ShaderPack::setPackFormat(ShaderPackFormat new_format)
 {
@@ -35,3 +35,8 @@ bool ShaderPack::valid() const
 {
     return m_pack_format != ShaderPackFormat::INVALID;
 }
+
+bool ShaderPack::applyFilter(QRegularExpression filter) const
+{
+    return valid() && Resource::applyFilter(filter);
+}
diff --git a/launcher/minecraft/mod/ShaderPack.h b/launcher/minecraft/mod/ShaderPack.h
index ec0f9404e..d07c124be 100644
--- a/launcher/minecraft/mod/ShaderPack.h
+++ b/launcher/minecraft/mod/ShaderPack.h
@@ -54,6 +54,7 @@ class ShaderPack : public Resource {
     void setPackFormat(ShaderPackFormat new_format);
 
     bool valid() const override;
+    [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
    protected:
     mutable QMutex m_data_lock;
diff --git a/launcher/minecraft/mod/ShaderPackFolderModel.h b/launcher/minecraft/mod/ShaderPackFolderModel.h
index 44ed37a47..186d02139 100644
--- a/launcher/minecraft/mod/ShaderPackFolderModel.h
+++ b/launcher/minecraft/mod/ShaderPackFolderModel.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include "ResourceFolderModel.h"
+#include "minecraft/mod/ShaderPack.h"
+#include "minecraft/mod/tasks/BasicFolderLoadTask.h"
+#include "minecraft/mod/tasks/LocalShaderPackParseTask.h"
 
 class ShaderPackFolderModel : public ResourceFolderModel {
     Q_OBJECT
@@ -9,4 +12,14 @@ class ShaderPackFolderModel : public ResourceFolderModel {
     explicit ShaderPackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) {}
 
     virtual QString id() const override { return "shaderpacks"; }
+
+    [[nodiscard]] Task* createUpdateTask() override
+    {
+        return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return makeShared<ShaderPack>(entry); });
+    }
+
+    [[nodiscard]] Task* createParseTask(Resource& resource) override
+    {
+        return new LocalShaderPackParseTask(m_next_resolution_ticket, static_cast<ShaderPack&>(resource));
+    }
 };

From f370f0d749f4b4ff85daf3e494e4a64ae0c5782a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 27 Sep 2023 05:33:22 -0400
Subject: [PATCH 21/35] chore: cleanup a few more mentions of mojang accounts

Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/LaunchController.cpp                | 4 ++--
 launcher/minecraft/auth/AccountList.cpp      | 2 +-
 launcher/ui/MainWindow.cpp                   | 2 +-
 launcher/ui/pages/global/AccountListPage.cpp | 2 +-
 launcher/ui/pages/instance/VersionPage.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
index b21eb281f..e1953abd6 100644
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -88,8 +88,8 @@ void LaunchController::decideAccount()
     if (accounts->count() <= 0) {
         // Tell the user they need to log in at least one account in order to play.
         auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
-                                                  tr("In order to play Minecraft, you must have at least one Microsoft or Mojang "
-                                                     "account logged in. Mojang accounts can only be used offline. "
+                                                  tr("In order to play Minecraft, you must have at least one Microsoft "
+                                                     "account logged in."
                                                      "Would you like to open the account manager to add an account now?"),
                                                   QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
                          ->exec();
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index a29de4ecf..eed11e030 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -366,7 +366,7 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
                 case NameColumn:
                     return tr("User name of the account.");
                 case TypeColumn:
-                    return tr("Type of the account - Mojang or MSA.");
+                    return tr("Type of the account (currently only MSA is supported.)");
                 case StatusColumn:
                     return tr("Current status of the account.");
                 default:
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 5e55a5abb..64873ebb8 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -872,7 +872,7 @@ void MainWindow::finalizeInstance(InstancePtr inst)
     } else {
         CustomMessageBox::selectable(this, tr("Error"),
                                      tr("The launcher cannot download Minecraft or update instances unless you have at least "
-                                        "one account added.\nPlease add your Microsoft or Mojang account."),
+                                        "one account added.\nPlease add a Microsoft account."),
                                      QMessageBox::Warning)
             ->show();
     }
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 90591c7f6..50f3ff2b6 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -153,7 +153,7 @@ void AccountListPage::on_actionAddOffline_triggered()
 {
     if (!m_accounts->anyAccountIsValid()) {
         QMessageBox::warning(this, tr("Error"),
-                             tr("You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account."
+                             tr("You must add a Microsoft account that owns Minecraft before you can add an offline account."
                                 "<br><br>"
                                 "If you have lost your account you can contact Microsoft for support."));
         return;
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index e22c764ca..2918261d2 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -411,7 +411,7 @@ void VersionPage::on_actionDownload_All_triggered()
     if (!APPLICATION->accounts()->anyAccountIsValid()) {
         CustomMessageBox::selectable(this, tr("Error"),
                                      tr("Cannot download Minecraft or update instances unless you have at least "
-                                        "one account added.\nPlease add your Microsoft or Mojang account."),
+                                        "one account added.\nPlease add a Microsoft account."),
                                      QMessageBox::Warning)
             ->show();
         return;

From 5b7c5607a90cbb6ff78ba140a15d6180842d069b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 28 Sep 2023 22:53:40 +0300
Subject: [PATCH 22/35] removed flame consturctor

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/ModIndex.cpp             | 17 -----------------
 launcher/modplatform/ModIndex.h               |  1 -
 launcher/modplatform/flame/FlameModIndex.cpp  | 17 ++++++++++++++++-
 launcher/modplatform/flame/FlamePackIndex.cpp | 17 ++++++++++++++++-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 72ba88d90..fc79dff15 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -32,23 +32,6 @@ static const QMap<QString, IndexedVersionType::VersionType> s_indexed_version_ty
 
 IndexedVersionType::IndexedVersionType(const QString& type) : IndexedVersionType(enumFromString(type)) {}
 
-IndexedVersionType::IndexedVersionType(int flame_type)
-{
-    switch (flame_type) {
-        case 1:
-            m_type = IndexedVersionType::VersionType::Release;
-            break;
-        case 2:
-            m_type = IndexedVersionType::VersionType::Beta;
-            break;
-        case 3:
-            m_type = IndexedVersionType::VersionType::Alpha;
-            break;
-        default:
-            m_type = IndexedVersionType::VersionType::Unknown;
-    }
-}
-
 IndexedVersionType::IndexedVersionType(const IndexedVersionType::VersionType& type)
 {
     m_type = type;
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 4ed8bcd86..4d6759d3b 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -62,7 +62,6 @@ struct DonationData {
 struct IndexedVersionType {
     enum class VersionType { Release = 1, Beta, Alpha, Unknown };
     IndexedVersionType(const QString& type);
-    IndexedVersionType(int flame_type);
     IndexedVersionType(const IndexedVersionType::VersionType& type);
     IndexedVersionType(const IndexedVersionType& type);
     IndexedVersionType() : IndexedVersionType(IndexedVersionType::VersionType::Unknown) {}
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 3754ae1a6..2adcd7814 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -139,7 +139,22 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     file.version = Json::requireString(obj, "displayName");
     file.downloadUrl = Json::ensureString(obj, "downloadUrl");
     file.fileName = Json::requireString(obj, "fileName");
-    file.version_type = ModPlatform::IndexedVersionType(Json::requireInteger(obj, "releaseType"));
+
+    ModPlatform::IndexedVersionType::VersionType ver_type;
+    switch (Json::requireInteger(obj, "releaseType")) {
+        case 1:
+            ver_type = ModPlatform::IndexedVersionType::VersionType::Release;
+            break;
+        case 2:
+            ver_type = ModPlatform::IndexedVersionType::VersionType::Beta;
+            break;
+        case 3:
+            ver_type = ModPlatform::IndexedVersionType::VersionType::Alpha;
+            break;
+        default:
+            ver_type = ModPlatform::IndexedVersionType::VersionType::Unknown;
+    }
+    file.version_type = ModPlatform::IndexedVersionType(ver_type);
 
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index 5a1606734..71f1e4a2d 100644
--- a/launcher/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
@@ -89,7 +89,22 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
         // pick the latest version supported
         file.mcVersion = versionArray[0].toString();
         file.version = Json::requireString(version, "displayName");
-        file.version_type = ModPlatform::IndexedVersionType(Json::requireInteger(version, "releaseType"));
+
+        ModPlatform::IndexedVersionType::VersionType ver_type;
+        switch (Json::requireInteger(version, "releaseType")) {
+            case 1:
+                ver_type = ModPlatform::IndexedVersionType::VersionType::Release;
+                break;
+            case 2:
+                ver_type = ModPlatform::IndexedVersionType::VersionType::Beta;
+                break;
+            case 3:
+                ver_type = ModPlatform::IndexedVersionType::VersionType::Alpha;
+                break;
+            default:
+                ver_type = ModPlatform::IndexedVersionType::VersionType::Unknown;
+        }
+        file.version_type = ModPlatform::IndexedVersionType(ver_type);
         file.downloadUrl = Json::ensureString(version, "downloadUrl");
 
         // only add if we have a download URL (third party distribution is enabled)

From 34294383ebaeff65d2a66a49426b2141c2d840c1 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 28 Sep 2023 23:18:23 +0300
Subject: [PATCH 23/35] added version type to dep update

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/ModUpdateDialog.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 43609121e..1a70ea59a 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -219,8 +219,10 @@ void ModUpdateDialog::checkCandidates()
             if (dep->pack->provider == ModPlatform::ResourceProvider::FLAME)
                 changelog = api.getModFileChangelog(dep->version.addonId.toInt(), dep->version.fileId.toInt());
             auto download_task = makeShared<ResourceDownloadTask>(dep->pack, dep->version, m_mod_model);
-            CheckUpdateTask::UpdatableMod updatable = { dep->pack->name, dep->version.hash,   "",           dep->version.version,
-                                                        changelog,       dep->pack->provider, download_task };
+            CheckUpdateTask::UpdatableMod updatable = {
+                dep->pack->name, dep->version.hash,   "",           dep->version.version, dep->version.version_type,
+                changelog,       dep->pack->provider, download_task
+            };
 
             appendMod(updatable, getRequiredBy.value(dep->version.addonId.toString()));
             m_tasks.insert(updatable.name, updatable.download);

From 84269f95961a49434c51b67aef15822ec3028ea6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Sep 2023 12:50:26 -0400
Subject: [PATCH 24/35] refactor(nix): use addOpenGLRunpath.driverLink in
 wrapper

Signed-off-by: seth <getchoo@tuta.io>
---
 nix/pkg/wrapper.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix
index 8bc255e71..cd356c8d7 100644
--- a/nix/pkg/wrapper.nix
+++ b/nix/pkg/wrapper.nix
@@ -4,6 +4,7 @@
   symlinkJoin,
   prismlauncher-unwrapped,
   wrapQtAppsHook,
+  addOpenGLRunpath,
   qtbase, # needed for wrapQtAppsHook
   qtsvg,
   qtwayland,
@@ -85,7 +86,7 @@ in
     in
       ["--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
       ++ lib.optionals stdenv.isLinux [
-        "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}"
+        "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
         # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
         "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
       ];

From 00bbbdc6e9f9e3e772c73b024b5f06a6ddf76f9a Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sun, 1 Oct 2023 00:31:51 +0300
Subject: [PATCH 25/35] Update launcher/LaunchController.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/LaunchController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
index e1953abd6..21a146062 100644
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -89,7 +89,7 @@ void LaunchController::decideAccount()
         // Tell the user they need to log in at least one account in order to play.
         auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
                                                   tr("In order to play Minecraft, you must have at least one Microsoft "
-                                                     "account logged in."
+                                                     "account which owns Minecraft logged in."
                                                      "Would you like to open the account manager to add an account now?"),
                                                   QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
                          ->exec();

From 317c7b5544a0f797593c0465d927089953c2b506 Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sun, 1 Oct 2023 00:32:17 +0300
Subject: [PATCH 26/35] Update launcher/minecraft/auth/AccountList.cpp

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/auth/AccountList.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index eed11e030..b141909a9 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -366,7 +366,7 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
                 case NameColumn:
                     return tr("User name of the account.");
                 case TypeColumn:
-                    return tr("Type of the account (currently only MSA is supported.)");
+                    return tr("Type of the account (MSA or Offline)");
                 case StatusColumn:
                     return tr("Current status of the account.");
                 default:

From be8a9f6541b2fe4cf552e8e5bb12fde4b9e83c49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 00:19:50 +0000
Subject: [PATCH 27/35] chore(nix): update lockfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
  → 'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
  → 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index f96336551..3ffe2dc8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,11 +106,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695318763,
-        "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
+        "lastModified": 1695978539,
+        "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
+        "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694364351,
-        "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=",
+        "lastModified": 1695576016,
+        "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7",
+        "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
         "type": "github"
       },
       "original": {

From 2cea7454efc8195f12b077adb67acfb2f064c0bd Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 1 Oct 2023 23:04:19 +0300
Subject: [PATCH 28/35] fix: do not update mods if no mod loader is selected

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/instance/ModFolderPage.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 69c34dafe..625d37933 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -206,6 +206,14 @@ void ModFolderPage::installMods()
 
 void ModFolderPage::updateMods()
 {
+    if (m_instance->typeName() != "Minecraft")
+        return;  // this is a null instance or a legacy instance
+
+    auto profile = static_cast<MinecraftInstance*>(m_instance)->getPackProfile();
+    if (!profile->getModLoaders().has_value()) {
+        QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
+        return;
+    }
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
 
     auto mods_list = m_model->selectedMods(selection);

From 93be8b07356058f85dd2977f941ab1fe219b36de Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 2 Oct 2023 09:13:02 +0300
Subject: [PATCH 29/35] refresh default account when list changes

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 64873ebb8..1202c3319 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -363,7 +363,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
     // Shouldn't have to use lambdas here like this, but if I don't, the compiler throws a fit.
     // Template hell sucks...
     connect(APPLICATION->accounts().get(), &AccountList::defaultAccountChanged, [this] { defaultAccountChanged(); });
-    connect(APPLICATION->accounts().get(), &AccountList::listChanged, [this] { repopulateAccountsMenu(); });
+    connect(APPLICATION->accounts().get(), &AccountList::listChanged, [this] { defaultAccountChanged(); });
 
     // Show initial account
     defaultAccountChanged();

From 77979b4c953aeff261a8d8bdd5b8a44297012de8 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 3 Oct 2023 17:23:26 +0300
Subject: [PATCH 30/35] revert back the release order

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlameAPI.cpp             | 4 +---
 launcher/modplatform/flame/FlameModIndex.cpp        | 3 +--
 launcher/modplatform/modrinth/ModrinthPackIndex.cpp | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index a9697893d..e99ce3a56 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -133,9 +133,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
             for (auto file : arr) {
                 auto file_obj = Json::requireObject(file);
                 auto file_tmp = FlameMod::loadIndexedPackVersion(file_obj);
-                if (file_tmp.date > ver.date &&
-                    (!args.loaders.has_value() || !file_tmp.loaders || args.loaders.value() & file_tmp.loaders) &&
-                    file_tmp.version_type <= ver.version_type)
+                if (file_tmp.date > ver.date && (!args.loaders.has_value() || !file_tmp.loaders || args.loaders.value() & file_tmp.loaders))
                     ver = file_tmp;
             }
 
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 2adcd7814..345883c17 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -96,9 +96,8 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     }
 
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.version_type <= b.version_type;
         // dates are in RFC 3339 format
-        return a.date > b.date && a_better_release;
+        return a.date > b.date;
     };
     std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);
     pack.versions = unsortedVersions;
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index f1e77d465..5c8aed1ac 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -109,9 +109,8 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArra
             unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-        bool a_better_release = a.version_type <= b.version_type;
         // dates are in RFC 3339 format
-        return a.date > b.date && a_better_release;
+        return a.date > b.date;
     };
     std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);
     pack.versions = unsortedVersions;

From 3cba5adb5af0bac91f19805fbbc7a99611c6b5a5 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 4 Oct 2023 09:41:40 +0300
Subject: [PATCH 31/35] updated dependency cycle

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From c6c17036e3842e0197c1c1aa4207f45610b812a7 Mon Sep 17 00:00:00 2001
From: nea <nea@nea.moe>
Date: Wed, 4 Oct 2023 21:20:59 +0200
Subject: [PATCH 32/35] Add more Java installation dirs

Signed-off-by: nea <nea@nea.moe>
---
 launcher/java/JavaUtils.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 3512c3079..cca1ed6d4 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -403,6 +403,14 @@ QList<QString> JavaUtils::FindJavaPaths()
     scanJavaDirs("/opt/jdks");
     // flatpak
     scanJavaDirs("/app/jdk");
+
+    auto home = qEnvironmentVariable("HOME");
+
+    // javas downloaded by IntelliJ
+    scanJavaDirs(FS::PathCombine(home, ".jdks"));
+    // javas downloaded by sdkman
+    scanJavaDirs(FS::PathCombine(home, ".sdkman/candidates/java"));
+
     javas = addJavasFromEnv(javas);
     javas.removeDuplicates();
     return javas;

From 05caa874bc3550c370ea6f278c1849cc481b8125 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 8 Oct 2023 00:18:30 +0000
Subject: [PATCH 33/35] chore(nix): update lockfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
  → 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
  → 'github:NixOS/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a?dir=lib' (2023-09-29)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
  → 'github:nixos/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
  → 'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05)
---
 flake.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3ffe2dc8e..b381db5ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1693611461,
-        "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+        "lastModified": 1696343447,
+        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695978539,
-        "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
+        "lastModified": 1696661029,
+        "narHash": "sha256-GIB5VTkvsDIqfMpdtuetOzpm64P8wm8nBSv5Eo8XM3Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8",
+        "rev": "2de1be5b51c3d6fa833f1c1f222dc867dd054b31",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1693471703,
-        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695576016,
-        "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
+        "lastModified": 1696516544,
+        "narHash": "sha256-8rKE8Je6twTNFRTGF63P9mE3lZIq917RAicdc4XJO80=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
+        "rev": "66c352d33e0907239e4a69416334f64af2c685cc",
         "type": "github"
       },
       "original": {

From 5f5214e5dd21d70efb8481bf3aea0bb0dabf4b12 Mon Sep 17 00:00:00 2001
From: Muslim <42213155+GitMuslim@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:00:57 +0300
Subject: [PATCH 34/35] add fullstop

Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 641622b5c..8761b950a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Prebuilt Development builds are provided for **Linux**, **Windows** and **macOS*
 
 For **Arch**, **Debian**, **Fedora**, **OpenSUSE (Tumbleweed)** and **Gentoo**, respectively, you can use these packages for the latest development versions:
 
-[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?label=MPR&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git)<br />[![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?label=COPR&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?label=Gentoo&logo=gentoo&logoColor=white)](https://packages.gentoo.org/packages/games-action/prismlauncher)
+[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?label=MPR&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git)<br />[![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?label=COPR&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?label=Gentoo&logo=gentoo&logoColor=white)](https://packages.gentoo.org/packages/games-action/prismlauncher).
 
 These packages are also availiable to all the distributions based on the ones mentioned above.
 

From 8eb8f167ab86647da60fe81997acc397ddbd438d Mon Sep 17 00:00:00 2001
From: Muslim <42213155+GitMuslim@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:02:56 +0300
Subject: [PATCH 35/35] oops

Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8761b950a..093bc94da 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Prebuilt Development builds are provided for **Linux**, **Windows** and **macOS*
 
 For **Arch**, **Debian**, **Fedora**, **OpenSUSE (Tumbleweed)** and **Gentoo**, respectively, you can use these packages for the latest development versions:
 
-[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?label=MPR&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git)<br />[![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?label=COPR&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?label=Gentoo&logo=gentoo&logoColor=white)](https://packages.gentoo.org/packages/games-action/prismlauncher).
+[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-git) [![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--qt5--git-1793D1?label=AUR&logo=archlinux&logoColor=white)](https://aur.archlinux.org/packages/prismlauncher-qt5-git) [![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-A80030?label=MPR&logo=debian&logoColor=white)](https://mpr.makedeb.org/packages/prismlauncher-git)<br />[![prismlauncher-nightly](https://img.shields.io/badge/copr-prismlauncher--nightly-51A2DA?label=COPR&logo=fedora&logoColor=white)](https://copr.fedorainfracloud.org/coprs/g3tchoo/prismlauncher/) [![prismlauncher-nightly](https://img.shields.io/badge/OBS-prismlauncher--nightly-3AB6A9?logo=opensuse&logoColor=white)](https://build.opensuse.org/project/show/home:getchoo) [![prismlauncher-9999](https://img.shields.io/badge/gentoo-prismlauncher--9999-4D4270?label=Gentoo&logo=gentoo&logoColor=white)](https://packages.gentoo.org/packages/games-action/prismlauncher)
 
 These packages are also availiable to all the distributions based on the ones mentioned above.
 
@@ -50,7 +50,7 @@ Feel free to create a GitHub issue if you find a bug or want to suggest a new fe
 
 ## Translations
 
-The translation effort for Prism Launcher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations>
+The translation effort for Prism Launcher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations>.
 
 ## Building