Merge remote-tracking branch 'upstream/develop' into data-packs

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/ui/dialogs/ResourceDownloadDialog.h

@@ -70,6 +70,8 @@ class ResourceDownloadDialog : public QDialog, public BasePageProvider {
     const QList<DownloadTaskPtr> getTasks();
     [[nodiscard]] const std::shared_ptr<ResourceFolderModel> getBaseModel() const { return m_base_model; }
 
+    void setResourceMetadata(const std::shared_ptr<Metadata::ModStruct>& meta);
+
    public slots:
     void accept() override;
     void reject() override;
@@ -108,8 +110,6 @@ class ModDownloadDialog final : public ResourceDownloadDialog {
     QList<BasePage*> getPages() override;
     GetModDependenciesTask::Ptr getModDependenciesTask() override;
 
-    void setModMetadata(std::shared_ptr<Metadata::ModStruct>);
-
    private:
     BaseInstance* m_instance;
 };