Fix conflicts

This commit is contained in:
Sebastian-byte
2021-10-21 17:57:41 -05:00
182 changed files with 1512 additions and 2583 deletions

View File

@@ -841,7 +841,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
// print a header
{
process->appendStep(new TextPrint(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::MultiMC));
process->appendStep(new TextPrint(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
}
// check java