Resolved merge conflict

api/logic/minecraft/MinecraftInstance.cpp

@@ -24,6 +24,7 @@
 #include "minecraft/launch/ReconstructAssets.h"
 #include "minecraft/launch/ScanModFolders.h"
 #include "minecraft/launch/InjectAuthlib.h"
+#include "minecraft/launch/VerifyJavaInstall.h"
 #include "java/launch/CheckJava.h"
 #include "java/JavaUtils.h"
 #include "meta/Index.h"
@@ -751,7 +752,7 @@ MessageLevel::Enum MinecraftInstance::guessLevel(const QString &line, MessageLev
         || line.contains(QRegularExpression("Caused by: " + javaSymbol))
         || line.contains(QRegularExpression("([a-zA-Z_$][a-zA-Z\\d_$]*\\.)+[a-zA-Z_$]?[a-zA-Z\\d_$]*(Exception|Error|Throwable)"))
         || line.contains(QRegularExpression("... \\d+ more$"))
-        )        
+        )
         return MessageLevel::Error;
     return level;
 }
@@ -923,6 +924,11 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(new ReconstructAssets(pptr));
     }
 
+    // verify that minimum Java requirements are met
+    {
+        process->appendStep(new VerifyJavaInstall(pptr));
+    }
+
     // authlib patch
     if (session->m_accountPtr->provider()->injectorEndpoint() != "")
     {