Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters

2023-12-13 14:48:31 +02:00
parent 2db5677281 a382754b1e
commit 763eab6b96
46 changed files with 324 additions and 152 deletions
--- a/launcher/minecraft/mod/ResourceFolderModel.h
+++ b/launcher/minecraft/mod/ResourceFolderModel.h
@@ -307,7 +307,6 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
            auto removed_it = m_resources.begin() + removed_index;

            Q_ASSERT(removed_it != m_resources.end());
-            Q_ASSERT(removed_set.contains(removed_it->get()->internal_id()));

            if ((*removed_it)->isResolving()) {
                auto ticket = (*removed_it)->resolutionTicket();