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

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

launcher/ui/pages/instance/LogPage.cpp

@@ -234,7 +234,7 @@ bool LogPage::apply()
 
 bool LogPage::shouldDisplay() const
 {
-    return m_instance->isRunning() || m_proxy->rowCount() > 0;
+    return true;
 }
 
 void LogPage::on_btnPaste_clicked()

launcher/ui/pages/instance/ModFolderPage.h

@@ -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;