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

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 17:44:23 +03:00
parent bf0a577fb9 954d4d701a
commit 27c3775f99
51 changed files with 422 additions and 329 deletions
@@ -43,7 +43,7 @@ QMap<QString, QString> ShaderPackResourcePage::urlHandlers() const
    return map;
 }

-void ShaderPackResourcePage::addResourceToPage(ModPlatform::IndexedPack& pack,
+void ShaderPackResourcePage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack,
                                               ModPlatform::IndexedVersion& version,
                                               const std::shared_ptr<ResourceFolderModel> base_model)
 {