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/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@ -19,7 +19,7 @@
 #include "settings/Setting.h"
 #include "tasks/Task.h"

-ResourceFolderModel::ResourceFolderModel(QDir dir, std::shared_ptr<const BaseInstance> instance, QObject* parent, bool create_dir)
+ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObject* parent, bool create_dir)
    : QAbstractListModel(parent), m_dir(dir), m_instance(instance), m_watcher(this)
 {
    if (create_dir) {