Merge branch 'develop' into feature/images-for-resource-page

2023-05-28 12:01:49 -07:00
parent 086a7e19f0 954d4d701a
commit b28f682ad9
120 changed files with 1978 additions and 603 deletions
--- a/launcher/minecraft/mod/ShaderPackFolderModel.h
+++ b/launcher/minecraft/mod/ShaderPackFolderModel.h
@ -6,7 +6,7 @@ class ShaderPackFolderModel : public ResourceFolderModel {
    Q_OBJECT

   public:
-    explicit ShaderPackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance)
+    explicit ShaderPackFolderModel(const QString& dir, BaseInstance* instance)
        : ResourceFolderModel(QDir(dir), instance)
    {}