Merge remote-tracking branch 'upstream/develop' into resource-meta

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2024-10-08 17:16:10 +01:00
49 changed files with 395 additions and 73 deletions

View File

@@ -73,6 +73,7 @@ class ModFolderPage : public ExternalResourcesPage {
};
class CoreModFolderPage : public ModFolderPage {
Q_OBJECT
public:
explicit CoreModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent = 0);
virtual ~CoreModFolderPage() = default;
@@ -86,6 +87,7 @@ class CoreModFolderPage : public ModFolderPage {
};
class NilModFolderPage : public ModFolderPage {
Q_OBJECT
public:
explicit NilModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel> mods, QWidget* parent = 0);
virtual ~NilModFolderPage() = default;