Merge branch 'develop' into curseforge-url-handle

9 files changed, 528 insertions, 181 deletions

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 8490b292..72b7db64 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1337,6 +1337,20 @@ void MainWindow::on_actionDeleteInstance_triggered()
     if (response != QMessageBox::Yes)
         return;
 
+    auto linkedInstances = APPLICATION->instances()->getLinkedInstancesById(id);
+    if (!linkedInstances.empty()) {
+        response = CustomMessageBox::selectable(
+                this, tr("There are linked instances"),
+                tr("The following instance(s) might reference files in this instance:\n\n"
+                "%1\n\n"
+                "Deleting it could break the other instance(s), \n\n"
+                "Do you wish to proceed?", nullptr, linkedInstances.count()).arg(linkedInstances.join("\n")), 
+                QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No
+            )->exec();
+        if (response != QMessageBox::Yes)
+            return;
+    }
+
     if (APPLICATION->instances()->trashInstance(id)) {
         ui->actionUndoTrashInstance->setEnabled(APPLICATION->instances()->trashedSomething());
         return;
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index ba453df6..fdfae597 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -195,7 +195,7 @@ void BlockedModsDialog::watchPath(QString path, bool watch_recursive)
     auto to_watch = QFileInfo(path);
     auto to_watch_path = to_watch.canonicalFilePath();
     if (m_watcher.directories().contains(to_watch_path))
-        return; // don't watch the same path twice (no loops!)
+        return;  // don't watch the same path twice (no loops!)
 
     qDebug() << "[Blocked Mods Dialog] Adding Watch Path:" << path;
     m_watcher.addPath(to_watch_path);
@@ -203,10 +203,9 @@ void BlockedModsDialog::watchPath(QString path, bool watch_recursive)
     if (!to_watch.isDir() || !watch_recursive)
         return;
 
-
     QDirIterator it(to_watch_path, QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot, QDirIterator::NoIteratorFlags);
     while (it.hasNext()) {
-        QString watch_dir = QDir(it.next()).canonicalPath(); // resolve symlinks and relative paths
+        QString watch_dir = QDir(it.next()).canonicalPath();  // resolve symlinks and relative paths
         watchPath(watch_dir, watch_recursive);
     }
 }
@@ -302,11 +301,35 @@ bool BlockedModsDialog::checkValidPath(QString path)
 {
     const QFileInfo file = QFileInfo(path);
     const QString filename = file.fileName();
-    QString laxFilename(filename);
-    laxFilename.replace('+', ' ');
 
-    auto compare = [](QString fsfilename, QString metadataFilename) {
-        return metadataFilename.compare(fsfilename, Qt::CaseInsensitive) == 0;
+    auto compare = [](QString fsFilename, QString metadataFilename) {
+        return metadataFilename.compare(fsFilename, Qt::CaseInsensitive) == 0;
+    };
+
+    // super lax compare (but not fuzzy)
+    // convert to lowercase
+    // convert all speratores to whitespace
+    // simplify sequence of internal whitespace to a single space
+    // efectivly compare two strings ignoring all separators and case
+    auto laxCompare = [](QString fsfilename, QString metadataFilename) {
+        // allowed character seperators
+        QList<QChar> allowedSeperators = { '-', '+', '.' , '_'};
+
+        // copy in lowercase
+        auto fsName = fsfilename.toLower();
+        auto metaName = metadataFilename.toLower();
+
+        // replace all potential allowed seperatores with whitespace
+        for (auto sep : allowedSeperators) {
+            fsName = fsName.replace(sep, ' ');
+            metaName = metaName.replace(sep, ' ');
+        }
+
+        // remove extraneous whitespace
+        fsName = fsName.simplified();
+        metaName = metaName.simplified();
+
+        return fsName.compare(metaName) == 0;
     };
 
     for (auto& mod : m_mods) {
@@ -314,7 +337,7 @@ bool BlockedModsDialog::checkValidPath(QString path)
             qDebug() << "[Blocked Mods Dialog] Name match found:" << mod.name << "| From path:" << path;
             return true;
         }
-        if (compare(laxFilename, mod.name)) {
+        if (laxCompare(filename, mod.name)) {
             qDebug() << "[Blocked Mods Dialog] Lax name match found:" << mod.name << "| From path:" << path;
             return true;
         }
diff --git a/launcher/ui/dialogs/CopyInstanceDialog.cpp b/launcher/ui/dialogs/CopyInstanceDialog.cpp
index 3f5122f6..d75bb5fe 100644
--- a/launcher/ui/dialogs/CopyInstanceDialog.cpp
+++ b/launcher/ui/dialogs/CopyInstanceDialog.cpp
@@ -37,18 +37,21 @@
 #include <QPushButton>
 
 #include "Application.h"
+#include "BuildConfig.h"
 #include "CopyInstanceDialog.h"
 #include "ui_CopyInstanceDialog.h"
 
 #include "ui/dialogs/IconPickerDialog.h"
 
-#include "BaseVersion.h"
-#include "icons/IconList.h"
 #include "BaseInstance.h"
+#include "BaseVersion.h"
+#include "DesktopServices.h"
+#include "FileSystem.h"
 #include "InstanceList.h"
+#include "icons/IconList.h"
 
-CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
-    :QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original)
+CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget* parent)
+    : QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original)
 {
     ui->setupUi(this);
     resize(minimumSizeHint());
@@ -71,8 +74,7 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
     groupList.push_front("");
     ui->groupBox->addItems(groupList);
     int index = groupList.indexOf(APPLICATION->instances()->getInstanceGroup(m_original->id()));
-    if(index == -1)
-    {
+    if (index == -1) {
         index = 0;
     }
     ui->groupBox->setCurrentIndex(index);
@@ -85,6 +87,35 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
     ui->copyServersCheckbox->setChecked(m_selectedOptions.isCopyServersEnabled());
     ui->copyModsCheckbox->setChecked(m_selectedOptions.isCopyModsEnabled());
     ui->copyScreenshotsCheckbox->setChecked(m_selectedOptions.isCopyScreenshotsEnabled());
+
+    ui->symbolicLinksCheckbox->setChecked(m_selectedOptions.isUseSymLinksEnabled());
+    ui->hardLinksCheckbox->setChecked(m_selectedOptions.isUseHardLinksEnabled());
+
+    ui->recursiveLinkCheckbox->setChecked(m_selectedOptions.isLinkRecursivelyEnabled());
+    ui->dontLinkSavesCheckbox->setChecked(m_selectedOptions.isDontLinkSavesEnabled());
+
+    auto detectedFS = FS::statFS(m_original->instanceRoot()).fsType;
+
+    m_cloneSupported = FS::canCloneOnFS(detectedFS);
+    m_linkSupported = FS::canLinkOnFS(detectedFS);
+
+    if (m_cloneSupported) {
+        ui->cloneSupportedLabel->setText(tr("Reflinks are supported on %1").arg(FS::getFilesystemTypeName(detectedFS)));
+    } else {
+        ui->cloneSupportedLabel->setText(tr("Reflinks aren't supported on %1").arg(FS::getFilesystemTypeName(detectedFS)));
+    }
+
+#if defined(Q_OS_WIN)
+    ui->symbolicLinksCheckbox->setIcon(style()->standardIcon(QStyle::SP_VistaShield));
+    ui->symbolicLinksCheckbox->setToolTip(tr("Use symbolic links instead of copying files.") +
+                                          "\n" + tr("On Windows, symbolic links may require admin permission to create."));
+#endif
+
+    updateLinkOptions();
+    updateUseCloneCheckbox();
+
+    auto HelpButton = ui->buttonBox->button(QDialogButtonBox::Help);
+    connect(HelpButton, &QPushButton::clicked, this, &CopyInstanceDialog::help);
 }
 
 CopyInstanceDialog::~CopyInstanceDialog()
@@ -96,8 +127,7 @@ void CopyInstanceDialog::updateDialogState()
 {
     auto allowOK = !instName().isEmpty();
     auto OkButton = ui->buttonBox->button(QDialogButtonBox::Ok);
-    if(OkButton->isEnabled() != allowOK)
-    {
+    if (OkButton->isEnabled() != allowOK) {
         OkButton->setEnabled(allowOK);
     }
 }
@@ -105,8 +135,7 @@ void CopyInstanceDialog::updateDialogState()
 QString CopyInstanceDialog::instName() const
 {
     auto result = ui->instNameTextBox->text().trimmed();
-    if(result.size())
-    {
+    if (result.size()) {
         return result;
     }
     return QString();
@@ -127,6 +156,11 @@ const InstanceCopyPrefs& CopyInstanceDialog::getChosenOptions() const
     return m_selectedOptions;
 }
 
+void CopyInstanceDialog::help()
+{
+    DesktopServices::openUrl(QUrl(BuildConfig.HELP_URL.arg("instance-copy")));
+}
+
 void CopyInstanceDialog::checkAllCheckboxes(const bool& b)
 {
     ui->keepPlaytimeCheckbox->setChecked(b);
@@ -147,20 +181,46 @@ void CopyInstanceDialog::updateSelectAllCheckbox()
     ui->selectAllCheckbox->blockSignals(false);
 }
 
+void CopyInstanceDialog::updateUseCloneCheckbox()
+{
+    ui->useCloneCheckbox->setEnabled(m_cloneSupported && !ui->symbolicLinksCheckbox->isChecked() && !ui->hardLinksCheckbox->isChecked());
+    ui->useCloneCheckbox->setChecked(m_cloneSupported && m_selectedOptions.isUseCloneEnabled() && !ui->symbolicLinksCheckbox->isChecked() &&
+                                     !ui->hardLinksCheckbox->isChecked());
+}
+
+void CopyInstanceDialog::updateLinkOptions()
+{
+    ui->symbolicLinksCheckbox->setEnabled(m_linkSupported && !ui->hardLinksCheckbox->isChecked() && !ui->useCloneCheckbox->isChecked());
+    ui->hardLinksCheckbox->setEnabled(m_linkSupported && !ui->symbolicLinksCheckbox->isChecked() && !ui->useCloneCheckbox->isChecked());
+
+    ui->symbolicLinksCheckbox->setChecked(m_linkSupported && m_selectedOptions.isUseSymLinksEnabled() &&
+                                          !ui->useCloneCheckbox->isChecked());
+    ui->hardLinksCheckbox->setChecked(m_linkSupported && m_selectedOptions.isUseHardLinksEnabled() && !ui->useCloneCheckbox->isChecked());
+
+    bool linksInUse = (ui->symbolicLinksCheckbox->isChecked() || ui->hardLinksCheckbox->isChecked());
+    ui->recursiveLinkCheckbox->setEnabled(m_linkSupported && linksInUse && !ui->hardLinksCheckbox->isChecked());
+    ui->dontLinkSavesCheckbox->setEnabled(m_linkSupported && linksInUse);
+    ui->recursiveLinkCheckbox->setChecked(m_linkSupported && linksInUse && m_selectedOptions.isLinkRecursivelyEnabled());
+    ui->dontLinkSavesCheckbox->setChecked(m_linkSupported && linksInUse && m_selectedOptions.isDontLinkSavesEnabled());
+
+#if defined(Q_OS_WIN)
+    auto OkButton = ui->buttonBox->button(QDialogButtonBox::Ok);
+    OkButton->setIcon(m_selectedOptions.isUseSymLinksEnabled() ? style()->standardIcon(QStyle::SP_VistaShield) : QIcon());
+#endif
+}
+
 void CopyInstanceDialog::on_iconButton_clicked()
 {
     IconPickerDialog dlg(this);
     dlg.execWithSelection(InstIconKey);
 
-    if (dlg.result() == QDialog::Accepted)
-    {
+    if (dlg.result() == QDialog::Accepted) {
         InstIconKey = dlg.selectedIconKey;
         ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
     }
 }
 
-
-void CopyInstanceDialog::on_instNameTextBox_textChanged(const QString &arg1)
+void CopyInstanceDialog::on_instNameTextBox_textChanged(const QString& arg1)
 {
     updateDialogState();
 }
@@ -175,10 +235,10 @@ void CopyInstanceDialog::on_selectAllCheckbox_stateChanged(int state)
 void CopyInstanceDialog::on_copySavesCheckbox_stateChanged(int state)
 {
     m_selectedOptions.enableCopySaves(state == Qt::Checked);
+    ui->dontLinkSavesCheckbox->setChecked((state == Qt::Checked) && ui->dontLinkSavesCheckbox->isChecked());
     updateSelectAllCheckbox();
 }
 
-
 void CopyInstanceDialog::on_keepPlaytimeCheckbox_stateChanged(int state)
 {
     m_selectedOptions.enableKeepPlaytime(state == Qt::Checked);
@@ -220,3 +280,38 @@ void CopyInstanceDialog::on_copyScreenshotsCheckbox_stateChanged(int state)
     m_selectedOptions.enableCopyScreenshots(state == Qt::Checked);
     updateSelectAllCheckbox();
 }
+
+void CopyInstanceDialog::on_symbolicLinksCheckbox_stateChanged(int state)
+{
+    m_selectedOptions.enableUseSymLinks(state == Qt::Checked);
+    updateUseCloneCheckbox();
+    updateLinkOptions();
+}
+
+void CopyInstanceDialog::on_hardLinksCheckbox_stateChanged(int state)
+{
+    m_selectedOptions.enableUseHardLinks(state == Qt::Checked);
+    if (state == Qt::Checked && !ui->recursiveLinkCheckbox->isChecked()) {
+        ui->recursiveLinkCheckbox->setChecked(true);
+    }
+    updateUseCloneCheckbox();
+    updateLinkOptions();
+}
+
+void CopyInstanceDialog::on_recursiveLinkCheckbox_stateChanged(int state)
+{
+    m_selectedOptions.enableLinkRecursively(state == Qt::Checked);
+    updateLinkOptions();
+}
+
+void CopyInstanceDialog::on_dontLinkSavesCheckbox_stateChanged(int state)
+{
+    m_selectedOptions.enableDontLinkSaves(state == Qt::Checked);
+}
+
+void CopyInstanceDialog::on_useCloneCheckbox_stateChanged(int state)
+{
+    m_selectedOptions.enableUseClone(m_cloneSupported && (state == Qt::Checked));
+    updateUseCloneCheckbox();
+    updateLinkOptions();
+}
diff --git a/launcher/ui/dialogs/CopyInstanceDialog.h b/launcher/ui/dialogs/CopyInstanceDialog.h
index 884501d1..698c6e93 100644
--- a/launcher/ui/dialogs/CopyInstanceDialog.h
+++ b/launcher/ui/dialogs/CopyInstanceDialog.h
@@ -16,22 +16,21 @@
 #pragma once
 
 #include <QDialog>
+#include "BaseInstance.h"
 #include "BaseVersion.h"
 #include "InstanceCopyPrefs.h"
 
 class BaseInstance;
 
-namespace Ui
-{
+namespace Ui {
 class CopyInstanceDialog;
 }
 
-class CopyInstanceDialog : public QDialog
-{
+class CopyInstanceDialog : public QDialog {
     Q_OBJECT
 
-public:
-    explicit CopyInstanceDialog(InstancePtr original, QWidget *parent = 0);
+   public:
+    explicit CopyInstanceDialog(InstancePtr original, QWidget* parent = 0);
     ~CopyInstanceDialog();
 
     void updateDialogState();
@@ -41,10 +40,12 @@ public:
     QString iconKey() const;
     const InstanceCopyPrefs& getChosenOptions() const;
 
-private
-slots:
+   public slots:
+    void help();
+
+   private slots:
     void on_iconButton_clicked();
-    void on_instNameTextBox_textChanged(const QString &arg1);
+    void on_instNameTextBox_textChanged(const QString& arg1);
     // Checkboxes
     void on_selectAllCheckbox_stateChanged(int state);
     void on_copySavesCheckbox_stateChanged(int state);
@@ -55,13 +56,23 @@ slots:
     void on_copyServersCheckbox_stateChanged(int state);
     void on_copyModsCheckbox_stateChanged(int state);
     void on_copyScreenshotsCheckbox_stateChanged(int state);
+    void on_symbolicLinksCheckbox_stateChanged(int state);
+    void on_hardLinksCheckbox_stateChanged(int state);
+    void on_recursiveLinkCheckbox_stateChanged(int state);
+    void on_dontLinkSavesCheckbox_stateChanged(int state);
+    void on_useCloneCheckbox_stateChanged(int state);
 
-private:
+   private:
     void checkAllCheckboxes(const bool& b);
     void updateSelectAllCheckbox();
+    void updateUseCloneCheckbox();
+    void updateLinkOptions();
+
     /* data */
-    Ui::CopyInstanceDialog *ui;
+    Ui::CopyInstanceDialog* ui;
     QString InstIconKey;
     InstancePtr m_original;
     InstanceCopyPrefs m_selectedOptions;
+    bool m_cloneSupported = false;
+    bool m_linkSupported = false;
 };
diff --git a/launcher/ui/dialogs/CopyInstanceDialog.ui b/launcher/ui/dialogs/CopyInstanceDialog.ui
index b7828fe3..5060debc 100644
--- a/launcher/ui/dialogs/CopyInstanceDialog.ui
+++ b/launcher/ui/dialogs/CopyInstanceDialog.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>341</width>
-    <height>399</height>
+    <width>575</width>
+    <height>695</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -113,93 +113,268 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="selectAllButtonLayout">
-     <item>
-      <widget class="QCheckBox" name="selectAllCheckbox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::LeftToRight</enum>
-       </property>
-       <property name="text">
-        <string>Select all</string>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QGroupBox" name="copyOptionsGroup">
+     <property name="title">
+      <string>Instance Copy Options</string>
+     </property>
+     <layout class="QGridLayout" name="copyOptionsLayout">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="keepPlaytimeCheckbox">
+        <property name="text">
+         <string>Keep play time</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QCheckBox" name="copyModsCheckbox">
+        <property name="toolTip">
+         <string>Disabling this will still keep the mod loader (ex: Fabric, Quilt, etc.) but erase the mods folder and their configs.</string>
+        </property>
+        <property name="text">
+         <string>Copy mods</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QCheckBox" name="copyResPacksCheckbox">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Copy resource packs</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="copyGameOptionsCheckbox">
+        <property name="toolTip">
+         <string>Copy the in-game options like FOV, max framerate, etc.</string>
+        </property>
+        <property name="text">
+         <string>Copy game options</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="copyShaderPacksCheckbox">
+        <property name="text">
+         <string>Copy shader packs</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QCheckBox" name="copyServersCheckbox">
+        <property name="text">
+         <string>Copy servers</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="copySavesCheckbox">
+        <property name="text">
+         <string>Copy saves</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="copyScreenshotsCheckbox">
+        <property name="text">
+         <string>Copy screenshots</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1">
+       <widget class="QCheckBox" name="selectAllCheckbox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text">
+         <string>Select all</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
-    <layout class="QGridLayout" name="copyOptionsLayout">
-     <item row="6" column="1">
-      <widget class="QCheckBox" name="copyModsCheckbox">
-       <property name="toolTip">
-        <string>Disabling this will still keep the mod loader (ex: Fabric, Quilt, etc.) but erase the mods folder and their configs.</string>
-       </property>
-       <property name="text">
-        <string>Copy mods</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QCheckBox" name="copyGameOptionsCheckbox">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="advancedOptionsLabel">
+     <property name="text">
+      <string>Advanced Copy Options</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="copyModeLayout">
+     <item>
+      <widget class="QGroupBox" name="linkFilesGroup">
        <property name="toolTip">
-        <string>Copy the in-game options like FOV, max framerate, etc.</string>
+        <string>Use symbolic or hard links instead of copying files.</string>
        </property>
-       <property name="text">
-        <string>Copy game options</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="copySavesCheckbox">
-       <property name="text">
-        <string>Copy saves</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="copyShaderPacksCheckbox">
-       <property name="text">
-        <string>Copy shader packs</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QCheckBox" name="copyServersCheckbox">
-       <property name="text">
-        <string>Copy servers</string>
+       <property name="title">
+        <string>Symbolic and Hard Link Options</string>
        </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QCheckBox" name="copyResPacksCheckbox">
-       <property name="enabled">
-        <bool>true</bool>
+       <property name="flat">
+        <bool>false</bool>
        </property>
-       <property name="text">
-        <string>Copy resource packs</string>
+       <property name="checkable">
+        <bool>false</bool>
        </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="keepPlaytimeCheckbox">
-       <property name="text">
-        <string>Keep play time</string>
+       <property name="checked">
+        <bool>false</bool>
        </property>
+       <layout class="QVBoxLayout" name="linkOptionsLayout">
+        <item>
+         <widget class="QLabel" name="linkOptionsLabel">
+          <property name="text">
+           <string>Links are supported on most filesystems except FAT</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QGridLayout" name="linkOptionsGridLayout" rowstretch="0,0,0,0" columnstretch="0,0" rowminimumheight="0,0,0,0" columnminimumwidth="0,0">
+          <property name="leftMargin">
+           <number>6</number>
+          </property>
+          <property name="topMargin">
+           <number>6</number>
+          </property>
+          <property name="rightMargin">
+           <number>6</number>
+          </property>
+          <property name="bottomMargin">
+           <number>6</number>
+          </property>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="recursiveLinkCheckbox">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>Link each resource individually instead of linking whole folders at once</string>
+            </property>
+            <property name="text">
+             <string>Link files recursively</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="dontLinkSavesCheckbox">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>If &quot;copy saves&quot; is selected world save data will be copied instead of linked and thus not shared between instances.</string>
+            </property>
+            <property name="text">
+             <string>Don't link saves</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="hardLinksCheckbox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>Use hard links instead of copying files.</string>
+            </property>
+            <property name="text">
+             <string>Use hard links</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="symbolicLinksCheckbox">
+            <property name="toolTip">
+             <string>Use symbolic links instead of copying files.</string>
+            </property>
+            <property name="text">
+             <string>Use symbolic links</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="copyScreenshotsCheckbox">
-       <property name="text">
-        <string>Copy screenshots</string>
+     <item>
+      <widget class="QGroupBox" name="horizontalGroupBox">
+       <property name="title">
+        <string>CoW (Copy-on-Write) Options</string>
        </property>
+       <layout class="QHBoxLayout" name="useCloneLayout">
+        <item>
+         <widget class="QCheckBox" name="useCloneCheckbox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Files cloned with reflinks take up no extra space until they are modified.</string>
+          </property>
+          <property name="text">
+           <string>Clone instead of copying</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="CoWSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="cloneSupportedLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Your filesystem and/or OS doesn't support reflinks</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="margin">
+           <number>4</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </item>
     </layout>
@@ -210,7 +385,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -220,10 +395,21 @@
   <tabstop>iconButton</tabstop>
   <tabstop>instNameTextBox</tabstop>
   <tabstop>groupBox</tabstop>
+  <tabstop>keepPlaytimeCheckbox</tabstop>
+  <tabstop>copyScreenshotsCheckbox</tabstop>
+  <tabstop>copySavesCheckbox</tabstop>
+  <tabstop>copyShaderPacksCheckbox</tabstop>
+  <tabstop>copyGameOptionsCheckbox</tabstop>
+  <tabstop>copyServersCheckbox</tabstop>
+  <tabstop>copyResPacksCheckbox</tabstop>
+  <tabstop>copyModsCheckbox</tabstop>
+  <tabstop>symbolicLinksCheckbox</tabstop>
+  <tabstop>recursiveLinkCheckbox</tabstop>
+  <tabstop>hardLinksCheckbox</tabstop>
+  <tabstop>dontLinkSavesCheckbox</tabstop>
+  <tabstop>useCloneCheckbox</tabstop>
  </tabstops>
- <resources>
-  <include location="../../graphics.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
@@ -232,8 +418,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>254</x>
-     <y>316</y>
+     <x>269</x>
+     <y>692</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -248,8 +434,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>322</x>
-     <y>316</y>
+     <x>337</x>
+     <y>692</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index f13e36e8..07ec3c70 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -45,6 +45,8 @@
 #include <QDebug>
 #include <QSaveFile>
 #include <QStack>
+#include <QFileInfo>
+
 #include "StringUtils.h"
 #include "SeparatorPrefixTree.h"
 #include "Application.h"
@@ -429,7 +431,8 @@ bool ExportInstanceDialog::doExport()
         QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
         return false;
     }
-    if (!MMCZip::compressDirFiles(output, m_instance->instanceRoot(), files))
+
+    if (!MMCZip::compressDirFiles(output, m_instance->instanceRoot(), files, true))
     {
         QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
         return false;
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index cc597fe0..eca3e865 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -46,7 +46,6 @@
 MinecraftPage::MinecraftPage(QWidget *parent) : QWidget(parent), ui(new Ui::MinecraftPage)
 {
     ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
     loadSettings();
     updateCheckboxStuff();
 }
diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui
index 640f436d..103881b5 100644
--- a/launcher/ui/pages/global/MinecraftPage.ui
+++ b/launcher/ui/pages/global/MinecraftPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>936</width>
-    <height>1134</height>
+    <height>541</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -39,7 +39,7 @@
      </property>
      <widget class="QWidget" name="minecraftTab">
       <attribute name="title">
-       <string notr="true">Minecraft</string>
+       <string notr="true">General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
@@ -112,22 +112,29 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="nativeLibWorkaroundGroupBox">
+        <widget class="QGroupBox" name="gameTimeGroupBox">
          <property name="title">
-          <string>Native library workarounds</string>
+          <string>Game time</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
+         <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
-           <widget class="QCheckBox" name="useNativeGLFWCheck">
+           <widget class="QCheckBox" name="showGameTime">
             <property name="text">
-             <string>Use system installation of &amp;GLFW</string>
+             <string>Show time spent &amp;playing instances</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="useNativeOpenALCheck">
+           <widget class="QCheckBox" name="showGlobalGameTime">
             <property name="text">
-             <string>Use system installation of &amp;OpenAL</string>
+             <string>Show time spent playing across &amp;all instances</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="recordGameTime">
+            <property name="text">
+             <string>&amp;Record time spent playing instances</string>
             </property>
            </widget>
           </item>
@@ -135,38 +142,28 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="perfomanceGroupBox">
+        <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Performance</string>
+          <string>Miscellaneous</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QCheckBox" name="enableFeralGamemodeCheck">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable Feral Interactive's GameMode, to potentially improve gaming performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Enable Feral GameMode</string>
-            </property>
-           </widget>
-          </item>
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QCheckBox" name="enableMangoHud">
+           <widget class="QCheckBox" name="closeAfterLaunchCheck">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable MangoHud's advanced performance overlay.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Enable MangoHud</string>
+             <string>&amp;Close the launcher after game window opens</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="useDiscreteGpuCheck">
+           <widget class="QCheckBox" name="quitAfterGameStopCheck">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the discrete GPU instead of the primary GPU.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically quit after the game exits or crashes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Use discrete GPU</string>
+             <string>&amp;Quit the launcher after game window closes</string>
             </property>
            </widget>
           </item>
@@ -174,29 +171,42 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="gameTimeGroupBox">
+        <spacer name="verticalSpacerMinecraft">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tweaks</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_12">
+       <item>
+        <widget class="QGroupBox" name="nativeLibWorkaroundGroupBox">
          <property name="title">
-          <string>Game time</string>
+          <string>Native library workarounds</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="verticalLayout_11">
           <item>
-           <widget class="QCheckBox" name="showGameTime">
-            <property name="text">
-             <string>Show time spent &amp;playing instances</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showGlobalGameTime">
+           <widget class="QCheckBox" name="useNativeGLFWCheck">
             <property name="text">
-             <string>Show time spent playing across &amp;all instances</string>
+             <string>Use system installation of &amp;GLFW</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="recordGameTime">
+           <widget class="QCheckBox" name="useNativeOpenALCheck">
             <property name="text">
-             <string>&amp;Record time spent playing instances</string>
+             <string>Use system installation of &amp;OpenAL</string>
             </property>
            </widget>
           </item>
@@ -204,28 +214,38 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox">
+        <widget class="QGroupBox" name="perfomanceGroupBox">
          <property name="title">
-          <string>Miscellaneous</string>
+          <string>Performance</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="QCheckBox" name="closeAfterLaunchCheck">
+           <widget class="QCheckBox" name="enableFeralGamemodeCheck">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable Feral Interactive's GameMode, to potentially improve gaming performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>&amp;Close the launcher after game window opens</string>
+             <string>Enable Feral GameMode</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="quitAfterGameStopCheck">
+           <widget class="QCheckBox" name="enableMangoHud">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically quit after the game exits or crashes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable MangoHud's advanced performance overlay.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>&amp;Quit the launcher after game window closes</string>
+             <string>Enable MangoHud</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="useDiscreteGpuCheck">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the discrete GPU instead of the primary GPU.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Use discrete GPU</string>
             </property>
            </widget>
           </item>
@@ -233,14 +253,14 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacerMinecraft">
+        <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>0</width>
-           <height>0</height>
+           <width>20</width>
+           <height>40</height>
           </size>
          </property>
         </spacer>
@@ -255,11 +275,6 @@
   <tabstop>maximizedCheckBox</tabstop>
   <tabstop>windowWidthSpinBox</tabstop>
   <tabstop>windowHeightSpinBox</tabstop>
-  <tabstop>useNativeGLFWCheck</tabstop>
-  <tabstop>useNativeOpenALCheck</tabstop>
-  <tabstop>enableFeralGamemodeCheck</tabstop>
-  <tabstop>enableMangoHud</tabstop>
-  <tabstop>useDiscreteGpuCheck</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index d4a395d9..b6ad159e 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -107,6 +107,7 @@ WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worl
     auto head = ui->worldTreeView->header();
     head->setSectionResizeMode(0, QHeaderView::Stretch);
     head->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    head->setSectionResizeMode(4, QHeaderView::ResizeToContents);
 
     connect(ui->worldTreeView->selectionModel(), &QItemSelectionModel::currentChanged, this, &WorldListPage::worldChanged);
     worldChanged(QModelIndex(), QModelIndex());