Merge branch 'MultiMC:develop' into develop

launcher/minecraft/auth/steps/LauncherLoginStep.cpp

@@ -50,7 +50,6 @@ void LauncherLoginStep::onRequestDone(
     auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
     requestor->deleteLater();
 
-    qDebug() << data;
     if (error != QNetworkReply::NoError) {
         qWarning() << "Reply error:" << error;
 #ifndef NDEBUG

launcher/mojang/PackageManifest.cpp

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #include "PackageManifest.h"
 #include <Json.h>
 #include <QDir>

launcher/mojang/PackageManifest.h

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #pragma once
 
 #include <QString>

launcher/mojang/PackageManifest_test.cpp

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #include <QTest>
 #include <QDebug>
 #include "TestUtil.h"

launcher/ui/pages/modplatform/import_ftb/Model.cpp

@@ -233,12 +233,13 @@ void resolveModloader(QString mcVersion, ModLoader &loader) {
             if(versionIsNext) {
                 loader.type = ModLoaderType::Forge;
                 loader.version = value;
-                break;
+                return;
             }
             if(value == "--fml.forgeVersion") {
                 versionIsNext = true;
             }
         }
+        loader.type = ModLoaderType::Unresolved;
         return;
     }
     catch (const JSONValidationError &e)