Merge pull request #1519 from TheKodeToad/better-export-pack

2 files changed, 5 insertions, 1 deletions

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 0863f0b2..d86d34bf 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -43,12 +43,14 @@ const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
                                          const QString& author,
+                                         bool optionalFiles,
                                          InstancePtr instance,
                                          const QString& output,
                                          MMCZip::FilterFunction filter)
     : name(name)
     , version(version)
     , author(author)
+    , optionalFiles(optionalFiles)
     , instance(instance)
     , mcInstance(dynamic_cast<MinecraftInstance*>(instance.get()))
     , gameRoot(instance->gameRoot())
@@ -410,7 +412,7 @@ QByteArray FlamePackExportTask::generateIndex()
         QJsonObject file;
         file["projectID"] = mod.addonId;
         file["fileID"] = mod.version;
-        file["required"] = mod.enabled;
+        file["required"] = mod.enabled || !optionalFiles;
         files << file;
     }
     obj["files"] = files;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index d3dc6281..78b46e91 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -30,6 +30,7 @@ class FlamePackExportTask : public Task {
     FlamePackExportTask(const QString& name,
                         const QString& version,
                         const QString& author,
+                        bool optionalFiles,
                         InstancePtr instance,
                         const QString& output,
                         MMCZip::FilterFunction filter);
@@ -44,6 +45,7 @@ class FlamePackExportTask : public Task {
 
     // inputs
     const QString name, version, author;
+    const bool optionalFiles;
     const InstancePtr instance;
     MinecraftInstance* mcInstance;
     const QDir gameRoot;