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

This commit is contained in:
Rachel Powers 2023-05-28 12:01:49 -07:00
commit b28f682ad9
120 changed files with 1978 additions and 603 deletions

View file

@ -18,7 +18,7 @@ public:
NUM_COLUMNS
};
explicit ResourcePackFolderModel(const QString &dir, std::shared_ptr<const BaseInstance> instance);
explicit ResourcePackFolderModel(const QString &dir, BaseInstance* instance);
virtual QString id() const override { return "resourcepacks"; }