Merge branch 'develop' into remove-updater

26 files changed, 1072 insertions, 92 deletions

diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index f8c7adeb..b41fe12a 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -1,10 +1,13 @@
 #pragma once
 
+class BasePage;
+
 class BasePageContainer
 {
 public:
     virtual ~BasePageContainer(){};
     virtual bool selectPage(QString pageId) = 0;
+    virtual BasePage* getPage(QString pageId) { return nullptr; };
     virtual void refreshContainer() = 0;
     virtual bool requestClose() = 0;
 };
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 2cee15bf..81dd4cc1 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -58,9 +58,8 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
 
-    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
-    ui->maxMemSpinBox->setMaximum(sysMiB);
     loadSettings();
+    updateThresholds();
 }
 
 JavaPage::~JavaPage()
@@ -177,6 +176,11 @@ void JavaPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void JavaPage::on_maxMemSpinBox_valueChanged(int i)
+{
+    updateThresholds();
+}
+
 void JavaPage::checkerFinished()
 {
     checker.reset();
@@ -186,3 +190,29 @@ void JavaPage::retranslate()
 {
     ui->retranslateUi(this);
 }
+
+void JavaPage::updateThresholds()
+{
+    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
+    unsigned int maxMem = ui->maxMemSpinBox->value();
+
+    QString iconName;
+
+    if (maxMem >= sysMiB) {
+        iconName = "status-bad";
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation exceeds your system memory capacity."));
+    } else if (maxMem > (sysMiB * 0.9)) {
+        iconName = "status-yellow";
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
+    } else {
+        iconName = "status-good";
+        ui->labelMaxMemIcon->setToolTip("");
+    }
+
+    {
+        auto height = ui->labelMaxMemIcon->fontInfo().pixelSize();
+        QIcon icon = APPLICATION->getThemedIcon(iconName);
+        QPixmap pix = icon.pixmap(height, height);
+        ui->labelMaxMemIcon->setPixmap(pix);
+    }
+}
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 64d4098e..2ef6d749 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -76,6 +76,8 @@ public:
     bool apply() override;
     void retranslate() override;
 
+    void updateThresholds();
+
 private:
     void applySettings();
     void loadSettings();
@@ -85,6 +87,7 @@ slots:
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
+    void on_maxMemSpinBox_valueChanged(int i);
     void checkerFinished();
 
 private:
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index 6ccffed4..6749cbe4 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -44,50 +44,38 @@
          <property name="title">
           <string>Memory</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="maxMemSpinBox">
-            <property name="toolTip">
-             <string>The maximum amount of memory Minecraft is allowed to use.</string>
-            </property>
-            <property name="suffix">
-             <string notr="true"> MiB</string>
-            </property>
-            <property name="minimum">
-             <number>128</number>
-            </property>
-            <property name="maximum">
-             <number>65536</number>
-            </property>
-            <property name="singleStep">
-             <number>128</number>
+         <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0,0">
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelMaxMem">
+            <property name="text">
+             <string>Ma&amp;ximum memory allocation:</string>
             </property>
-            <property name="value">
-             <number>1024</number>
+            <property name="buddy">
+             <cstring>maxMemSpinBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelMinMem">
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelPermGen">
             <property name="text">
-             <string>&amp;Minimum memory allocation:</string>
+             <string notr="true">&amp;PermGen:</string>
             </property>
             <property name="buddy">
-             <cstring>minMemSpinBox</cstring>
+             <cstring>permGenSpinBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelMaxMem">
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelMinMem">
             <property name="text">
-             <string>Ma&amp;ximum memory allocation:</string>
+             <string>&amp;Minimum memory allocation:</string>
             </property>
             <property name="buddy">
-             <cstring>maxMemSpinBox</cstring>
+             <cstring>minMemSpinBox</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="0" column="2">
            <widget class="QSpinBox" name="minMemSpinBox">
             <property name="toolTip">
              <string>The amount of memory Minecraft is started with.</string>
@@ -99,7 +87,7 @@
              <number>128</number>
             </property>
             <property name="maximum">
-             <number>65536</number>
+             <number>1048576</number>
             </property>
             <property name="singleStep">
              <number>128</number>
@@ -109,17 +97,29 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPermGen">
-            <property name="text">
-             <string notr="true">&amp;PermGen:</string>
+          <item row="1" column="2">
+           <widget class="QSpinBox" name="maxMemSpinBox">
+            <property name="toolTip">
+             <string>The maximum amount of memory Minecraft is allowed to use.</string>
             </property>
-            <property name="buddy">
-             <cstring>permGenSpinBox</cstring>
+            <property name="suffix">
+             <string notr="true"> MiB</string>
+            </property>
+            <property name="minimum">
+             <number>128</number>
+            </property>
+            <property name="maximum">
+             <number>1048576</number>
+            </property>
+            <property name="singleStep">
+             <number>128</number>
+            </property>
+            <property name="value">
+             <number>1024</number>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="2" column="2">
            <widget class="QSpinBox" name="permGenSpinBox">
             <property name="toolTip">
              <string>The amount of memory available to store loaded Java classes.</string>
@@ -141,6 +141,16 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="3">
+           <widget class="QLabel" name="labelMaxMemIcon">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="buddy">
+             <cstring>maxMemSpinBox</cstring>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index b6c873cc..c66d1368 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -14,8 +14,6 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
 {
     ui->setupUi(this);
 
-    ExternalResourcesPage::runningStateChanged(m_instance && m_instance->isRunning());
-
     ui->actionsToolbar->insertSpacer(ui->actionViewConfigs);
 
     m_filterModel = model->createFilterProxyModel(this);
@@ -45,7 +43,6 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
     auto selection_model = ui->treeView->selectionModel();
     connect(selection_model, &QItemSelectionModel::currentChanged, this, &ExternalResourcesPage::current);
     connect(ui->filterEdit, &QLineEdit::textChanged, this, &ExternalResourcesPage::filterTextChanged);
-    connect(m_instance, &BaseInstance::runningStatusChanged, this, &ExternalResourcesPage::runningStateChanged);
 }
 
 ExternalResourcesPage::~ExternalResourcesPage()
@@ -70,11 +67,21 @@ void ExternalResourcesPage::ShowContextMenu(const QPoint& pos)
 void ExternalResourcesPage::openedImpl()
 {
     m_model->startWatching();
+
+    auto const setting_name = QString("WideBarVisibility_%1").arg(id());
+    if (!APPLICATION->settings()->contains(setting_name))
+        m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
+    else
+        m_wide_bar_setting = APPLICATION->settings()->getSetting(setting_name);
+
+    ui->actionsToolbar->setVisibilityState(m_wide_bar_setting->get().toByteArray());
 }
 
 void ExternalResourcesPage::closedImpl()
 {
     m_model->stopWatching();
+
+    m_wide_bar_setting->set(ui->actionsToolbar->getVisibilityState());
 }
 
 void ExternalResourcesPage::retranslate()
@@ -97,14 +104,6 @@ void ExternalResourcesPage::filterTextChanged(const QString& newContents)
     m_filterModel->setFilterRegularExpression(m_viewFilter);
 }
 
-void ExternalResourcesPage::runningStateChanged(bool running)
-{
-    if (m_controlsEnabled == !running)
-        return;
-    
-    m_controlsEnabled = !running;
-}
-
 bool ExternalResourcesPage::shouldDisplay() const
 {
     return true;
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 8e352cef..2d1a5b51 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -4,6 +4,7 @@
 #include <QSortFilterProxyModel>
 
 #include "Application.h"
+#include "settings/Setting.h"
 #include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
 
@@ -47,7 +48,6 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
    protected slots:
     void itemActivated(const QModelIndex& index);
     void filterTextChanged(const QString& newContents);
-    virtual void runningStateChanged(bool running);
 
     virtual void addItem();
     virtual void removeItem();
@@ -71,4 +71,6 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     QString m_viewFilter;
 
     bool m_controlsEnabled = true;
+
+    std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 5da7f19f..af2ba7c8 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -59,12 +59,12 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
 {
     m_settings = inst->settings();
     ui->setupUi(this);
-    auto sysMB = Sys::getSystemRam() / Sys::mebibyte;
-    ui->maxMemSpinBox->setMaximum(sysMB);
+
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
     loadSettings();
+    updateThresholds();
 }
 
 bool InstanceSettingsPage::shouldDisplay() const
@@ -437,6 +437,11 @@ void InstanceSettingsPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void InstanceSettingsPage::on_maxMemSpinBox_valueChanged(int i)
+{
+    updateThresholds();
+}
+
 void InstanceSettingsPage::checkerFinished()
 {
     checker.reset();
@@ -447,3 +452,29 @@ void InstanceSettingsPage::retranslate()
     ui->retranslateUi(this);
     ui->customCommands->retranslate();  // TODO: why is this seperate from the others?
 }
+
+void InstanceSettingsPage::updateThresholds()
+{
+    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
+    unsigned int maxMem = ui->maxMemSpinBox->value();
+
+    QString iconName;
+
+    if (maxMem >= sysMiB) {
+        iconName = "status-bad";
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation exceeds your system memory capacity."));
+    } else if (maxMem > (sysMiB * 0.9)) {
+        iconName = "status-yellow";
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
+    } else {
+        iconName = "status-good";
+        ui->labelMaxMemIcon->setToolTip("");
+    }
+
+    {
+        auto height = ui->labelMaxMemIcon->fontInfo().pixelSize();
+        QIcon icon = APPLICATION->getThemedIcon(iconName);
+        QPixmap pix = icon.pixmap(height, height);
+        ui->labelMaxMemIcon->setPixmap(pix);
+    }
+}
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 97d1296f..7450188d 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -77,10 +77,13 @@ public:
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
+    void updateThresholds();
+
 private slots:
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
+    void on_maxMemSpinBox_valueChanged(int i);
 
     void applySettings();
     void loadSettings();
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 8b3c3370..b064367d 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -112,7 +112,14 @@
          <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0,0">
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelPermGen">
+            <property name="text">
+             <string notr="true">PermGen:</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="labelMinMem">
             <property name="text">
@@ -120,10 +127,24 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="maxMemSpinBox">
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelMaxMem">
+            <property name="text">
+             <string>Maximum memory allocation:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" colspan="3">
+           <widget class="QLabel" name="labelPermgenNote">
+            <property name="text">
+             <string>Note: Permgen is set automatically by Java 8 and later</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QSpinBox" name="minMemSpinBox">
             <property name="toolTip">
-             <string>The maximum amount of memory Minecraft is allowed to use.</string>
+             <string>The amount of memory Minecraft is started with.</string>
             </property>
             <property name="suffix">
              <string notr="true"> MiB</string>
@@ -132,20 +153,20 @@
              <number>128</number>
             </property>
             <property name="maximum">
-             <number>65536</number>
+             <number>1048576</number>
             </property>
             <property name="singleStep">
              <number>128</number>
             </property>
             <property name="value">
-             <number>1024</number>
+             <number>256</number>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="minMemSpinBox">
+          <item row="1" column="2">
+           <widget class="QSpinBox" name="maxMemSpinBox">
             <property name="toolTip">
-             <string>The amount of memory Minecraft is started with.</string>
+             <string>The maximum amount of memory Minecraft is allowed to use.</string>
             </property>
             <property name="suffix">
              <string notr="true"> MiB</string>
@@ -154,17 +175,17 @@
              <number>128</number>
             </property>
             <property name="maximum">
-             <number>65536</number>
+             <number>1048576</number>
             </property>
             <property name="singleStep">
              <number>128</number>
             </property>
             <property name="value">
-             <number>256</number>
+             <number>1024</number>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="2" column="2">
            <widget class="QSpinBox" name="permGenSpinBox">
             <property name="toolTip">
              <string>The amount of memory available to store loaded Java classes.</string>
@@ -186,24 +207,16 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="labelPermGen">
+          <item row="1" column="3">
+           <widget class="QLabel" name="labelMaxMemIcon">
             <property name="text">
-             <string notr="true">PermGen:</string>
+             <string notr="true"/>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="labelMaxMem">
-            <property name="text">
-             <string>Maximum memory allocation:</string>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="2">
-           <widget class="QLabel" name="labelPermgenNote">
-            <property name="text">
-             <string>Note: Permgen is set automatically by Java 8 and later</string>
+            <property name="buddy">
+             <cstring>maxMemSpinBox</cstring>
             </property>
            </widget>
           </item>
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
new file mode 100644
index 00000000..4de80468
--- /dev/null
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -0,0 +1,433 @@
+// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "ManagedPackPage.h"
+#include "ui_ManagedPackPage.h"
+
+#include <QListView>
+#include <QProxyStyle>
+#include <QStyleFactory>
+
+#include <HoeDown.h>
+
+#include "Application.h"
+#include "BuildConfig.h"
+#include "InstanceImportTask.h"
+#include "InstanceList.h"
+#include "InstanceTask.h"
+#include "Json.h"
+
+#include "modplatform/modrinth/ModrinthPackManifest.h"
+
+#include "ui/InstanceWindow.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
+
+/** This is just to override the combo box popup behavior so that the combo box doesn't take the whole screen.
+ *  ... thanks Qt.
+ */
+class NoBigComboBoxStyle : public QProxyStyle {
+    Q_OBJECT
+
+   public:
+    NoBigComboBoxStyle(QStyle* style) : QProxyStyle(style) {}
+
+    // clang-format off
+    int styleHint(QStyle::StyleHint hint, const QStyleOption* option = nullptr, const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override
+    {
+        if (hint == QStyle::SH_ComboBox_Popup)
+            return false;
+
+        return QProxyStyle::styleHint(hint, option, widget, returnData);
+    }
+    // clang-format on
+};
+
+ManagedPackPage* ManagedPackPage::createPage(BaseInstance* inst, QString type, QWidget* parent)
+{
+    if (type == "modrinth")
+        return new ModrinthManagedPackPage(inst, nullptr, parent);
+    if (type == "flame" && (APPLICATION->capabilities() & Application::SupportsFlame))
+        return new FlameManagedPackPage(inst, nullptr, parent);
+
+    return new GenericManagedPackPage(inst, nullptr, parent);
+}
+
+ManagedPackPage::ManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent)
+    : QWidget(parent), m_instance_window(instance_window), ui(new Ui::ManagedPackPage), m_inst(inst)
+{
+    Q_ASSERT(inst);
+
+    ui->setupUi(this);
+
+    // NOTE: GTK2 themes crash with the proxy style.
+    // This seems like an upstream bug, so there's not much else that can be done.
+    if (!QStyleFactory::keys().contains("gtk2"))
+        ui->versionsComboBox->setStyle(new NoBigComboBoxStyle(ui->versionsComboBox->style()));
+
+    ui->reloadButton->setVisible(false);
+    connect(ui->reloadButton, &QPushButton::clicked, this, [this](bool){
+        ui->reloadButton->setVisible(false);
+
+        m_loaded = false;
+        // Pretend we're opening the page again
+        openedImpl();
+    });
+}
+
+ManagedPackPage::~ManagedPackPage()
+{
+    delete ui;
+}
+
+void ManagedPackPage::openedImpl()
+{
+    ui->packName->setText(m_inst->getManagedPackName());
+    ui->packVersion->setText(m_inst->getManagedPackVersionName());
+    ui->packOrigin->setText(tr("Website: <a href=%1>%2</a>    |    Pack ID: %3    |    Version ID: %4")
+                                .arg(url(), displayName(), m_inst->getManagedPackID(), m_inst->getManagedPackVersionID()));
+
+    parseManagedPack();
+}
+
+QString ManagedPackPage::displayName() const
+{
+    auto type = m_inst->getManagedPackType();
+    if (type.isEmpty())
+        return {};
+    if (type == "flame")
+        type = "CurseForge";
+    return type.replace(0, 1, type[0].toUpper());
+}
+
+QIcon ManagedPackPage::icon() const
+{
+    return APPLICATION->getThemedIcon(m_inst->getManagedPackType());
+}
+
+QString ManagedPackPage::helpPage() const
+{
+    return {};
+}
+
+void ManagedPackPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
+
+bool ManagedPackPage::shouldDisplay() const
+{
+    return m_inst->isManagedPack();
+}
+
+bool ManagedPackPage::runUpdateTask(InstanceTask* task)
+{
+    Q_ASSERT(task);
+
+    unique_qobject_ptr<Task> wrapped_task(APPLICATION->instances()->wrapInstanceTask(task));
+
+    connect(task, &Task::failed,
+            [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
+    connect(task, &Task::succeeded, [this, task]() {
+        QStringList warnings = task->warnings();
+        if (warnings.count())
+            CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
+    });
+    connect(task, &Task::aborted, [this] {
+        CustomMessageBox::selectable(this, tr("Task aborted"), tr("The task has been aborted by the user."), QMessageBox::Information)
+            ->show();
+    });
+
+    ProgressDialog loadDialog(this);
+    loadDialog.setSkipButton(true, tr("Abort"));
+    loadDialog.execWithTask(task);
+
+    return task->wasSuccessful();
+}
+
+void ManagedPackPage::suggestVersion()
+{
+    ui->updateButton->setText(tr("Update pack"));
+    ui->updateButton->setDisabled(false);
+}
+
+void ManagedPackPage::setFailState()
+{
+    qDebug() << "Setting fail state!";
+
+    // We block signals here so that suggestVersion() doesn't get called, causing an assertion fail.
+    ui->versionsComboBox->blockSignals(true);
+    ui->versionsComboBox->clear();
+    ui->versionsComboBox->addItem(tr("Failed to search for available versions."), {});
+    ui->versionsComboBox->blockSignals(false);
+
+    ui->changelogTextBrowser->setText(tr("Failed to request changelog data for this modpack."));
+
+    ui->updateButton->setText(tr("Cannot update!"));
+    ui->updateButton->setDisabled(true);
+
+    ui->reloadButton->setVisible(true);
+}
+
+ModrinthManagedPackPage::ModrinthManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent)
+    : ManagedPackPage(inst, instance_window, parent)
+{
+    Q_ASSERT(inst->isManagedPack());
+    connect(ui->versionsComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(suggestVersion()));
+    connect(ui->updateButton, &QPushButton::pressed, this, &ModrinthManagedPackPage::update);
+}
+
+// MODRINTH
+
+void ModrinthManagedPackPage::parseManagedPack()
+{
+    qDebug() << "Parsing Modrinth pack";
+
+    // No need for the extra work because we already have everything we need.
+    if (m_loaded)
+        return;
+
+    if (m_fetch_job && m_fetch_job->isRunning())
+        m_fetch_job->abort();
+
+    m_fetch_job.reset(new NetJob(QString("Modrinth::PackVersions(%1)").arg(m_inst->getManagedPackName()), APPLICATION->network()));
+    auto response = std::make_shared<QByteArray>();
+
+    QString id = m_inst->getManagedPackID();
+
+    m_fetch_job->addNetAction(Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response.get()));
+
+    QObject::connect(m_fetch_job.get(), &NetJob::succeeded, this, [this, response, id] {
+        QJsonParseError parse_error{};
+        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Modrinth at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *response;
+
+            setFailState();
+
+            return;
+        }
+
+        try {
+            Modrinth::loadIndexedVersions(m_pack, doc);
+        } catch (const JSONValidationError& e) {
+            qDebug() << *response;
+            qWarning() << "Error while reading modrinth modpack version: " << e.cause();
+
+            setFailState();
+            return;
+        }
+
+        // We block signals here so that suggestVersion() doesn't get called, causing an assertion fail.
+        ui->versionsComboBox->blockSignals(true);
+        ui->versionsComboBox->clear();
+        ui->versionsComboBox->blockSignals(false);
+
+        for (auto version : m_pack.versions) {
+            QString name = version.version;
+
+            if (!version.name.contains(version.version))
+                name = QString("%1 — %2").arg(version.name, version.version);
+
+            // NOTE: the id from version isn't the same id in the modpack format spec...
+            // e.g. HexMC's 4.4.0 has versionId 4.0.0 in the modpack index..............
+            if (version.version == m_inst->getManagedPackVersionName())
+                name = tr("%1 (Current)").arg(name);
+
+
+            ui->versionsComboBox->addItem(name, QVariant(version.id));
+        }
+
+        suggestVersion();
+
+        m_loaded = true;
+    });
+    QObject::connect(m_fetch_job.get(), &NetJob::failed, this, &ModrinthManagedPackPage::setFailState);
+    QObject::connect(m_fetch_job.get(), &NetJob::aborted, this, &ModrinthManagedPackPage::setFailState);
+
+    ui->changelogTextBrowser->setText(tr("Fetching changelogs..."));
+
+    m_fetch_job->start();
+}
+
+QString ModrinthManagedPackPage::url() const
+{
+    return "https://modrinth.com/mod/" + m_inst->getManagedPackID();
+}
+
+void ModrinthManagedPackPage::suggestVersion()
+{
+    auto index = ui->versionsComboBox->currentIndex();
+    auto version = m_pack.versions.at(index);
+
+    HoeDown md_parser;
+    ui->changelogTextBrowser->setHtml(md_parser.process(version.changelog.toUtf8()));
+
+    ManagedPackPage::suggestVersion();
+}
+
+void ModrinthManagedPackPage::update()
+{
+    auto index = ui->versionsComboBox->currentIndex();
+    auto version = m_pack.versions.at(index);
+
+    QMap<QString, QString> extra_info;
+    // NOTE: Don't use 'm_pack.id' here, since we didn't completely parse all the metadata for the pack, including this field.
+    extra_info.insert("pack_id", m_inst->getManagedPackID());
+    extra_info.insert("pack_version_id", version.id);
+    extra_info.insert("original_instance_id", m_inst->id());
+
+    auto extracted = new InstanceImportTask(version.download_url, this, std::move(extra_info));
+
+    InstanceName inst_name(m_inst->getManagedPackName(), version.version);
+    inst_name.setName(m_inst->name().replace(m_inst->getManagedPackVersionName(), version.version));
+    extracted->setName(inst_name);
+
+    extracted->setGroup(APPLICATION->instances()->getInstanceGroup(m_inst->id()));
+    extracted->setIcon(m_inst->iconKey());
+    extracted->setConfirmUpdate(false);
+
+    auto did_succeed = runUpdateTask(extracted);
+
+    if (m_instance_window && did_succeed)
+        m_instance_window->close();
+}
+
+// FLAME
+
+FlameManagedPackPage::FlameManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent)
+    : ManagedPackPage(inst, instance_window, parent)
+{
+    Q_ASSERT(inst->isManagedPack());
+    connect(ui->versionsComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(suggestVersion()));
+    connect(ui->updateButton, &QPushButton::pressed, this, &FlameManagedPackPage::update);
+}
+
+void FlameManagedPackPage::parseManagedPack()
+{
+    qDebug() << "Parsing Flame pack";
+
+    // We need to tell the user to redownload the pack, since we didn't save the required info previously
+    if (m_inst->getManagedPackID().isEmpty()) {
+        setFailState();
+        QString message =
+            tr("<h1>Hey there!</h1>"
+               "<h4>"
+               "It seems like your Pack ID is null. This is because of a bug in older versions of the launcher.<br/>"
+               "Unfortunately, we can't do the proper API requests without this information.<br/>"
+               "<br/>"
+               "So, in order for this feature to work, you will need to re-download the modpack from the built-in downloader.<br/>"
+               "<br/>"
+               "Don't worry though, it will ask you to update this instance instead, so you'll not lose this instance!"
+               "</h4>");
+
+        ui->changelogTextBrowser->setHtml(message);
+        return;
+    }
+
+    // No need for the extra work because we already have everything we need.
+    if (m_loaded)
+        return;
+
+    if (m_fetch_job && m_fetch_job->isRunning())
+        m_fetch_job->abort();
+
+    m_fetch_job.reset(new NetJob(QString("Flame::PackVersions(%1)").arg(m_inst->getManagedPackName()), APPLICATION->network()));
+    auto response = std::make_shared<QByteArray>();
+
+    QString id = m_inst->getManagedPackID();
+
+    m_fetch_job->addNetAction(Net::Download::makeByteArray(QString("%1/mods/%2/files").arg(BuildConfig.FLAME_BASE_URL, id), response.get()));
+
+    QObject::connect(m_fetch_job.get(), &NetJob::succeeded, this, [this, response, id] {
+        QJsonParseError parse_error{};
+        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Flame at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *response;
+
+            setFailState();
+
+            return;
+        }
+
+        try {
+            auto obj = doc.object();
+            auto data = Json::ensureArray(obj, "data");
+            Flame::loadIndexedPackVersions(m_pack, data);
+        } catch (const JSONValidationError& e) {
+            qDebug() << *response;
+            qWarning() << "Error while reading flame modpack version: " << e.cause();
+
+            setFailState();
+            return;
+        }
+
+        // We block signals here so that suggestVersion() doesn't get called, causing an assertion fail.
+        ui->versionsComboBox->blockSignals(true);
+        ui->versionsComboBox->clear();
+        ui->versionsComboBox->blockSignals(false);
+
+        for (auto version : m_pack.versions) {
+            QString name = version.version;
+
+            if (version.fileId == m_inst->getManagedPackVersionID().toInt())
+                name = tr("%1 (Current)").arg(name);
+
+            ui->versionsComboBox->addItem(name, QVariant(version.fileId));
+        }
+
+        suggestVersion();
+
+        m_loaded = true;
+    });
+    QObject::connect(m_fetch_job.get(), &NetJob::failed, this, &FlameManagedPackPage::setFailState);
+    QObject::connect(m_fetch_job.get(), &NetJob::aborted, this, &FlameManagedPackPage::setFailState);
+
+    m_fetch_job->start();
+}
+
+QString FlameManagedPackPage::url() const
+{
+    // FIXME: We should display the websiteUrl field, but this requires doing the API request first :(
+    return {};
+}
+
+void FlameManagedPackPage::suggestVersion()
+{
+    auto index = ui->versionsComboBox->currentIndex();
+    auto version = m_pack.versions.at(index);
+
+    ui->changelogTextBrowser->setHtml(m_api.getModFileChangelog(m_inst->getManagedPackID().toInt(), version.fileId));
+
+    ManagedPackPage::suggestVersion();
+}
+
+void FlameManagedPackPage::update()
+{
+    auto index = ui->versionsComboBox->currentIndex();
+    auto version = m_pack.versions.at(index);
+
+    QMap<QString, QString> extra_info;
+    extra_info.insert("pack_id", m_inst->getManagedPackID());
+    extra_info.insert("pack_version_id", QString::number(version.fileId));
+    extra_info.insert("original_instance_id", m_inst->id());
+
+    auto extracted = new InstanceImportTask(version.downloadUrl, this, std::move(extra_info));
+
+    extracted->setName(m_inst->name());
+    extracted->setGroup(APPLICATION->instances()->getInstanceGroup(m_inst->id()));
+    extracted->setIcon(m_inst->iconKey());
+    extracted->setConfirmUpdate(false);
+
+    auto did_succeed = runUpdateTask(extracted);
+
+    if (m_instance_window && did_succeed)
+        m_instance_window->close();
+}
+
+#include "ManagedPackPage.moc"
diff --git a/launcher/ui/pages/instance/ManagedPackPage.h b/launcher/ui/pages/instance/ManagedPackPage.h
new file mode 100644
index 00000000..d29a5e88
--- /dev/null
+++ b/launcher/ui/pages/instance/ManagedPackPage.h
@@ -0,0 +1,152 @@
+// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include "BaseInstance.h"
+
+#include "modplatform/modrinth/ModrinthAPI.h"
+#include "modplatform/modrinth/ModrinthPackManifest.h"
+
+#include "modplatform/flame/FlameAPI.h"
+#include "modplatform/flame/FlamePackIndex.h"
+
+#include "ui/pages/BasePage.h"
+
+#include <QWidget>
+
+namespace Ui {
+class ManagedPackPage;
+}
+
+class InstanceTask;
+class InstanceWindow;
+
+class ManagedPackPage : public QWidget, public BasePage {
+    Q_OBJECT
+
+   public:
+    inline static ManagedPackPage* createPage(BaseInstance* inst, QWidget* parent = nullptr)
+    {
+        return ManagedPackPage::createPage(inst, inst->getManagedPackType(), parent);
+    }
+
+    static ManagedPackPage* createPage(BaseInstance* inst, QString type, QWidget* parent = nullptr);
+    ~ManagedPackPage() override;
+
+    [[nodiscard]] QString displayName() const override;
+    [[nodiscard]] QIcon icon() const override;
+    [[nodiscard]] QString helpPage() const override;
+    [[nodiscard]] QString id() const override { return "managed_pack"; }
+    [[nodiscard]] bool shouldDisplay() const override;
+
+    void openedImpl() override;
+
+    bool apply() override { return true; }
+    void retranslate() override;
+
+    /** Gets the necessary information about the managed pack, such as
+     *  available versions*/
+    virtual void parseManagedPack(){};
+
+    /** URL of the managed pack.
+     *  Not the version-specific one.
+     */
+    [[nodiscard]] virtual QString url() const { return {}; };
+
+    void setInstanceWindow(InstanceWindow* window) { m_instance_window = window; }
+
+   public slots:
+    /** Gets the current version selection and update the UI, including the update button and the changelog.
+     */
+    virtual void suggestVersion();
+
+    virtual void update(){};
+
+   protected slots:
+    /** Does the necessary UI changes for when something failed.
+     *
+     *  This includes:
+     *  - Setting an appropriate text on the version selector to indicate a fail;
+     *  - Setting an appropriate text on the changelog text browser to indicate a fail;
+     *  - Disable the update button.
+     */
+    void setFailState();
+
+   protected:
+    ManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent = nullptr);
+
+    /** Run the InstanceTask, with a progress dialog and all.
+     *  Similar to MainWindow::instanceFromInstanceTask
+     *
+     *  Returns whether the task was successful.
+     */
+    bool runUpdateTask(InstanceTask*);
+
+   protected:
+    InstanceWindow* m_instance_window = nullptr;
+
+    Ui::ManagedPackPage* ui;
+    BaseInstance* m_inst;
+
+    bool m_loaded = false;
+};
+
+/** Simple page for when we aren't a managed pack. */
+class GenericManagedPackPage final : public ManagedPackPage {
+    Q_OBJECT
+
+   public:
+    GenericManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent = nullptr)
+        : ManagedPackPage(inst, instance_window, parent)
+    {}
+    ~GenericManagedPackPage() override = default;
+
+    // TODO: We may want to show this page with some useful info at some point.
+    [[nodiscard]] bool shouldDisplay() const override { return false; };
+};
+
+class ModrinthManagedPackPage final : public ManagedPackPage {
+    Q_OBJECT
+
+   public:
+    ModrinthManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent = nullptr);
+    ~ModrinthManagedPackPage() override = default;
+
+    void parseManagedPack() override;
+    [[nodiscard]] QString url() const override;
+
+   public slots:
+    void suggestVersion() override;
+
+    void update() override;
+
+   private:
+    NetJob::Ptr m_fetch_job = nullptr;
+
+    Modrinth::Modpack m_pack;
+    ModrinthAPI m_api;
+};
+
+class FlameManagedPackPage final : public ManagedPackPage {
+    Q_OBJECT
+
+   public:
+    FlameManagedPackPage(BaseInstance* inst, InstanceWindow* instance_window, QWidget* parent = nullptr);
+    ~FlameManagedPackPage() override = default;
+
+    void parseManagedPack() override;
+    [[nodiscard]] QString url() const override;
+
+   public slots:
+    void suggestVersion() override;
+
+    void update() override;
+
+   private:
+    NetJob::Ptr m_fetch_job = nullptr;
+
+    Flame::IndexedPack m_pack;
+    FlameAPI m_api;
+};
diff --git a/launcher/ui/pages/instance/ManagedPackPage.ui b/launcher/ui/pages/instance/ManagedPackPage.ui
new file mode 100644
index 00000000..bbe44a94
--- /dev/null
+++ b/launcher/ui/pages/instance/ManagedPackPage.ui
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ManagedPackPage</class>
+ <widget class="QWidget" name="ManagedPackPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>731</width>
+    <height>538</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QGroupBox" name="packInformationBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Pack information</string>
+       </property>
+       <layout class="QFormLayout" name="formLayout_2">
+        <item row="0" column="0">
+         <layout class="QHBoxLayout" name="packNameLayout">
+          <item>
+           <widget class="QLabel" name="packNameLabel">
+            <property name="text">
+             <string>Pack name:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="packName">
+            <property name="text">
+             <string notr="true">placeholder</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="0">
+         <layout class="QHBoxLayout" name="packVersionLayout">
+          <item>
+           <widget class="QLabel" name="packVersionLabel">
+            <property name="text">
+             <string>Current version:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="packVersion">
+            <property name="cursor">
+             <cursorShape>IBeamCursor</cursorShape>
+            </property>
+            <property name="text">
+             <string notr="true">placeholder</string>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="2" column="0">
+         <layout class="QHBoxLayout" name="packOriginLayout">
+          <item>
+           <widget class="QLabel" name="packOriginLabel">
+            <property name="text">
+             <string>Provider information:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="packOrigin">
+            <property name="cursor">
+             <cursorShape>IBeamCursor</cursorShape>
+            </property>
+            <property name="text">
+             <string notr="true">placeholder</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="updateToVersionLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Update to version:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="versionsComboBox"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="updateButton">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Fetching versions...</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="changelogBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Changelog</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QTextBrowser" name="changelogTextBrowser">
+          <property name="placeholderText">
+           <string>No changelog available for this version!</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="reloadButton">
+     <property name="text">
+      <string>Reload page</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index f0106066..0a2e6155 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -108,13 +108,13 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
             disconnect(mods.get(), &ModFolderModel::updateFinished, this, 0);
         });
 
+        connect(m_instance, &BaseInstance::runningStatusChanged, this, &ModFolderPage::runningStateChanged);
         ModFolderPage::runningStateChanged(m_instance && m_instance->isRunning());
     }
 }
 
 void ModFolderPage::runningStateChanged(bool running)
 {
-    ExternalResourcesPage::runningStateChanged(running);
     ui->actionDownloadItem->setEnabled(!running);
     ui->actionUpdateItem->setEnabled(!running);
     ui->actionAddItem->setEnabled(!running);
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index c9a55bde..f20adf34 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -53,12 +53,12 @@ class ModFolderPage : public ExternalResourcesPage {
     virtual QString helpPage() const override { return "Loader-mods"; }
 
     virtual bool shouldDisplay() const override;
-    void runningStateChanged(bool running) override;
 
    public slots:
     bool onSelectionChanged(const QModelIndex& current, const QModelIndex& previous) override;
 
    private slots:
+    void runningStateChanged(bool running);
     void removeItem() override;
 
     void installMods();
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index c97253e4..0092aef3 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -537,6 +537,19 @@ void ScreenshotsPage::openedImpl()
             ui->listView->setModel(nullptr);
         }
     }
+
+    auto const setting_name = QString("WideBarVisibility_%1").arg(id());
+    if (!APPLICATION->settings()->contains(setting_name))
+        m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
+    else
+        m_wide_bar_setting = APPLICATION->settings()->getSetting(setting_name);
+
+    ui->toolBar->setVisibilityState(m_wide_bar_setting->get().toByteArray());
+}
+
+void ScreenshotsPage::closedImpl()
+{
+    m_wide_bar_setting->set(ui->toolBar->getVisibilityState());
 }
 
 #include "ScreenshotsPage.moc"
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.h b/launcher/ui/pages/instance/ScreenshotsPage.h
index cdd53cc9..89611b6d 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.h
+++ b/launcher/ui/pages/instance/ScreenshotsPage.h
@@ -40,6 +40,8 @@
 #include "ui/pages/BasePage.h"
 #include <Application.h>
 
+#include "settings/Setting.h"
+
 class QFileSystemModel;
 class QIdentityProxyModel;
 class QItemSelection;
@@ -60,7 +62,8 @@ public:
     explicit ScreenshotsPage(QString path, QWidget *parent = 0);
     virtual ~ScreenshotsPage();
 
-    virtual void openedImpl() override;
+    void openedImpl() override;
+    void closedImpl() override;
 
     enum
     {
@@ -111,4 +114,6 @@ private:
     QString m_folder;
     bool m_valid = false;
     bool m_uploadActive = false;
+
+    std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index a4f9f330..08389aa3 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -766,11 +766,21 @@ void ServersPage::updateState()
 void ServersPage::openedImpl()
 {
     m_model->observe();
+
+    auto const setting_name = QString("WideBarVisibility_%1").arg(id());
+    if (!APPLICATION->settings()->contains(setting_name))
+        m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
+    else
+        m_wide_bar_setting = APPLICATION->settings()->getSetting(setting_name);
+
+    ui->toolBar->setVisibilityState(m_wide_bar_setting->get().toByteArray());
 }
 
 void ServersPage::closedImpl()
 {
     m_model->unobserve();
+
+    m_wide_bar_setting->set(ui->toolBar->getVisibilityState());
 }
 
 void ServersPage::on_actionAdd_triggered()
diff --git a/launcher/ui/pages/instance/ServersPage.h b/launcher/ui/pages/instance/ServersPage.h
index 37399d49..476e7d70 100644
--- a/launcher/ui/pages/instance/ServersPage.h
+++ b/launcher/ui/pages/instance/ServersPage.h
@@ -42,6 +42,8 @@
 #include "ui/pages/BasePage.h"
 #include <Application.h>
 
+#include "settings/Setting.h"
+
 namespace Ui
 {
 class ServersPage;
@@ -68,7 +70,7 @@ public:
     }
     virtual QIcon icon() const override
     {
-        return APPLICATION->getThemedIcon("unknown_server");
+        return APPLICATION->getThemedIcon("server");
     }
     virtual QString id() const override
     {
@@ -112,5 +114,7 @@ private: // data
     Ui::ServersPage *ui = nullptr;
     ServersModel * m_model = nullptr;
     InstancePtr m_inst = nullptr;
+
+    std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };
 
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index a021c633..c8a65f10 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -125,6 +126,21 @@ void VersionPage::retranslate()
     ui->retranslateUi(this);
 }
 
+void VersionPage::openedImpl()
+{
+    auto const setting_name = QString("WideBarVisibility_%1").arg(id());
+    if (!APPLICATION->settings()->contains(setting_name))
+        m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
+    else
+        m_wide_bar_setting = APPLICATION->settings()->getSetting(setting_name);
+
+    ui->toolBar->setVisibilityState(m_wide_bar_setting->get().toByteArray());
+}
+void VersionPage::closedImpl()
+{
+    m_wide_bar_setting->set(ui->toolBar->getVisibilityState());
+}
+
 QMenu * VersionPage::createPopupMenu()
 {
     QMenu* filteredMenu = QMainWindow::createPopupMenu();
@@ -270,6 +286,7 @@ void VersionPage::updateButtons(int row)
     ui->actionInstall_mods->setEnabled(controlsEnabled);
     ui->actionReplace_Minecraft_jar->setEnabled(controlsEnabled);
     ui->actionAdd_to_Minecraft_jar->setEnabled(controlsEnabled);
+    ui->actionAdd_Agents->setEnabled(controlsEnabled);
 }
 
 bool VersionPage::reloadPackProfile()
@@ -342,6 +359,18 @@ void VersionPage::on_actionReplace_Minecraft_jar_triggered()
     updateButtons();
 }
 
+
+void VersionPage::on_actionAdd_Agents_triggered()
+{
+    QStringList list = GuiUtil::BrowseForFiles("agent", tr("Select agents"), tr("Java agents (*.jar)"),
+                                               APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
+
+    if (!list.isEmpty())
+        m_profile->installAgents(list);
+
+    updateButtons();
+}
+
 void VersionPage::on_actionMove_up_triggered()
 {
     try
diff --git a/launcher/ui/pages/instance/VersionPage.h b/launcher/ui/pages/instance/VersionPage.h
index 979311fc..166f36bb 100644
--- a/launcher/ui/pages/instance/VersionPage.h
+++ b/launcher/ui/pages/instance/VersionPage.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,6 +70,9 @@ public:
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
+    void openedImpl() override;
+    void closedImpl() override;
+
 private slots:
     void on_actionChange_version_triggered();
     void on_actionInstall_Forge_triggered();
@@ -82,6 +86,7 @@ private slots:
     void on_actionMove_down_triggered();
     void on_actionAdd_to_Minecraft_jar_triggered();
     void on_actionReplace_Minecraft_jar_triggered();
+    void on_actionAdd_Agents_triggered();
     void on_actionRevert_triggered();
     void on_actionEdit_triggered();
     void on_actionInstall_mods_triggered();
@@ -114,6 +119,8 @@ private:
     int currentIdx = 0;
     bool controlsEnabled = false;
 
+    std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
+
 public slots:
     void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
 
diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui
index 14b7cd9f..74b9568a 100644
--- a/launcher/ui/pages/instance/VersionPage.ui
+++ b/launcher/ui/pages/instance/VersionPage.ui
@@ -109,6 +109,7 @@
    <addaction name="separator"/>
    <addaction name="actionAdd_to_Minecraft_jar"/>
    <addaction name="actionReplace_Minecraft_jar"/>
+   <addaction name="actionAdd_Agents"/>
    <addaction name="actionAdd_Empty"/>
    <addaction name="separator"/>
    <addaction name="actionMinecraftFolder"/>
@@ -226,6 +227,14 @@
     <string>Replace Minecraft.jar</string>
    </property>
   </action>
+  <action name="actionAdd_Agents">
+   <property name="text">
+	<string>Add Agents</string>
+   </property>
+   <property name="toolTip">
+	<string>Add Java agents.</string>
+   </property>
+  </action>
   <action name="actionAdd_Empty">
    <property name="text">
     <string>Add Empty</string>
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 7819d077..b8b48ef9 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -113,11 +113,21 @@ WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worl
 void WorldListPage::openedImpl()
 {
     m_worlds->startWatching();
+
+    auto const setting_name = QString("WideBarVisibility_%1").arg(id());
+    if (!APPLICATION->settings()->contains(setting_name))
+        m_wide_bar_setting = APPLICATION->settings()->registerSetting(setting_name);
+    else
+        m_wide_bar_setting = APPLICATION->settings()->getSetting(setting_name);
+
+    ui->toolBar->setVisibilityState(m_wide_bar_setting->get().toByteArray());
 }
 
 void WorldListPage::closedImpl()
 {
     m_worlds->stopWatching();
+
+    m_wide_bar_setting->set(ui->toolBar->getVisibilityState());
 }
 
 WorldListPage::~WorldListPage()
diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h
index 1dc9e53e..925521be 100644
--- a/launcher/ui/pages/instance/WorldListPage.h
+++ b/launcher/ui/pages/instance/WorldListPage.h
@@ -42,6 +42,8 @@
 #include <Application.h>
 #include <LoggedProcess.h>
 
+#include "settings/Setting.h"
+
 class WorldList;
 namespace Ui
 {
@@ -102,6 +104,8 @@ private:
     unique_qobject_ptr<LoggedProcess> m_mceditProcess;
     bool m_mceditStarting = false;
 
+    std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
+
 private slots:
     void on_actionCopy_Seed_triggered();
     void on_actionMCEdit_triggered();
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index a65b6585..f9ac4a78 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -197,12 +197,18 @@ void FlamePage::suggestCurrent()
         return;
     }
 
-    if (selectedVersion.isEmpty() || selectedVersion == "-1") {
+    if (m_selected_version_index == -1) {
         dialog->setSuggestedPack();
         return;
     }
 
-    dialog->setSuggestedPack(current.name, new InstanceImportTask(selectedVersion,this));
+    auto version = current.versions.at(m_selected_version_index);
+
+    QMap<QString, QString> extra_info;
+    extra_info.insert("pack_id", QString::number(current.addonId));
+    extra_info.insert("pack_version_id", QString::number(version.fileId));
+
+    dialog->setSuggestedPack(current.name, new InstanceImportTask(version.downloadUrl, this, std::move(extra_info)));
     QString editedLogoName;
     editedLogoName = "curseforge_" + current.logoName.section(".", 0, 0);
     listModel->getLogo(current.logoName, current.logoUrl,
@@ -211,11 +217,18 @@ void FlamePage::suggestCurrent()
 
 void FlamePage::onVersionSelectionChanged(QString data)
 {
-    if (data.isNull() || data.isEmpty()) {
-        selectedVersion = "";
+    bool is_blocked = false;
+    ui->versionSelectionBox->currentData().toInt(&is_blocked);
+
+    if (data.isNull() || data.isEmpty() || is_blocked) {
+        m_selected_version_index = -1;
         return;
     }
-    selectedVersion = ui->versionSelectionBox->currentData().toString();
+
+    m_selected_version_index = ui->versionSelectionBox->currentIndex();
+
+    Q_ASSERT(current.versions.at(m_selected_version_index).downloadUrl == ui->versionSelectionBox->currentData().toString());
+
     suggestCurrent();
 }
 
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.h b/launcher/ui/pages/modplatform/flame/FlamePage.h
index 8130e416..8bdca38e 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.h
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.h
@@ -99,5 +99,5 @@ private:
     Flame::ListModel* listModel = nullptr;
     Flame::IndexedPack current;
 
-    QString selectedVersion;
+    int m_selected_version_index = -1;
 };
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 4482774c..8ab2ad1d 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -300,7 +300,11 @@ void ModrinthPage::suggestCurrent()
 
     for (auto& ver : current.versions) {
         if (ver.id == selectedVersion) {
-            dialog->setSuggestedPack(current.name, ver.version, new InstanceImportTask(ver.download_url, this));
+            QMap<QString, QString> extra_info;
+            extra_info.insert("pack_id", current.id);
+            extra_info.insert("pack_version_id", ver.id);
+
+            dialog->setSuggestedPack(current.name, ver.version, new InstanceImportTask(ver.download_url, this, std::move(extra_info)));
             auto iconName = current.iconName;
             m_model->getLogo(iconName, current.iconUrl.toString(),
                              [this, iconName](QString logo) { dialog->setSuggestedIconFromFile(logo, iconName); });