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/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@ -76,7 +76,7 @@ public:
        Enable,
        Toggle
    };
-    ModFolderModel(const QString &dir, std::shared_ptr<const BaseInstance> instance, bool is_indexed = false, bool create_dir = true);
+    ModFolderModel(const QString &dir, BaseInstance* instance, bool is_indexed = false, bool create_dir = true);

    virtual QString id() const override { return "mods"; }