From 7229ebbb08902ec085cbc1d23c8bb681343b6086 Mon Sep 17 00:00:00 2001 From: Toby Foster Date: Wed, 15 Sep 2021 18:10:00 +1000 Subject: [PATCH 1/5] Fix underaged account that isn't linked to a family help link. --- launcher/minecraft/auth/flows/AuthContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/minecraft/auth/flows/AuthContext.cpp b/launcher/minecraft/auth/flows/AuthContext.cpp index b4db6c2d..95d36bca 100644 --- a/launcher/minecraft/auth/flows/AuthContext.cpp +++ b/launcher/minecraft/auth/flows/AuthContext.cpp @@ -643,7 +643,7 @@ void AuthContext::checkResult() { changeState( STATE_FAILED_HARD, tr("This Microsoft account is underaged and is not linked to a family.\n\nPlease set up your account according to %1.") - .arg("help.minecraft.net") + .arg("help.minecraft.net") ); } else { From 28d7c5d3093fdc71fe75fffd03057c8c2d8d18e8 Mon Sep 17 00:00:00 2001 From: tobfos Date: Wed, 15 Sep 2021 20:46:07 +1000 Subject: [PATCH 2/5] Removed unnecessary text in link. Thanks @RDKRACZ. --- launcher/minecraft/auth/flows/AuthContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/minecraft/auth/flows/AuthContext.cpp b/launcher/minecraft/auth/flows/AuthContext.cpp index 95d36bca..961057ca 100644 --- a/launcher/minecraft/auth/flows/AuthContext.cpp +++ b/launcher/minecraft/auth/flows/AuthContext.cpp @@ -643,7 +643,7 @@ void AuthContext::checkResult() { changeState( STATE_FAILED_HARD, tr("This Microsoft account is underaged and is not linked to a family.\n\nPlease set up your account according to %1.") - .arg("help.minecraft.net") + .arg("help.minecraft.net") ); } else { From 433dd2d16168845889373ffb98a9f3b806ea1de2 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Thu, 23 Sep 2021 00:52:10 +0100 Subject: [PATCH 3/5] GH-4114 Allow the same file for be downloaded to multiple paths This is a potential fix to GH-4114. --- launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp index 2e87a754..496edde7 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -108,12 +108,12 @@ void PackInstallTask::downloadPack() auto relpath = FS::PathCombine("minecraft", file.path, file.name); auto path = FS::PathCombine(m_stagingPath, relpath); - if (filesToCopy.contains(entry->getFullPath())) { + if (filesToCopy.contains(path)) { qWarning() << "Ignoring" << file.url << "as a file of that path is already downloading."; continue; } qDebug() << "Will download" << file.url << "to" << path; - filesToCopy[entry->getFullPath()] = path; + filesToCopy[path] = entry->getFullPath(); auto dl = Net::Download::makeCached(file.url, entry); if (!file.sha1.isEmpty()) { @@ -149,8 +149,8 @@ void PackInstallTask::install() setStatus(tr("Copying modpack files")); for (auto iter = filesToCopy.begin(); iter != filesToCopy.end(); iter++) { - auto &from = iter.key(); - auto &to = iter.value(); + auto &to = iter.key(); + auto &from = iter.value(); FS::copy fileCopyOperation(from, to); if(!fileCopyOperation()) { qWarning() << "Failed to copy" << from << "to" << to; From 0b312956dbb30128f9f966ab1913b20b78c181e6 Mon Sep 17 00:00:00 2001 From: Philip T <2097483+phit@users.noreply.github.com> Date: Sun, 3 Oct 2021 13:41:37 +0200 Subject: [PATCH 4/5] NOISSUE Remove outdated SSL docs the link is dead and the equivalent newer page is useless, https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn265983(v=ws.11)?redirectedfrom=MSDN#related-content --- launcher/minecraft/auth/flows/Yggdrasil.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/launcher/minecraft/auth/flows/Yggdrasil.cpp b/launcher/minecraft/auth/flows/Yggdrasil.cpp index c2935d05..ce828fd4 100644 --- a/launcher/minecraft/auth/flows/Yggdrasil.cpp +++ b/launcher/minecraft/auth/flows/Yggdrasil.cpp @@ -243,9 +243,7 @@ void Yggdrasil::processReply() STATE_FAILED_SOFT, tr("SSL Handshake failed.
There might be a few causes for it:
" "
    " - "
  • You use Windows XP and need to update " - "your root certificates
    • " + "
  • You use Windows and need to update your root certificates, please install any outstanding updates.
    • " "
  • Some device on your network is interfering with SSL traffic. In that case, " "you have bigger worries than Minecraft not starting.
    • " "
  • Possibly something else. Check the MultiMC log file for details
    • " From 3138e58c7593c9360b749b17a9630ef7b2ffe47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 3 Oct 2021 21:46:10 +0200 Subject: [PATCH 5/5] NOISSUE fix typo in FMLLibrariesTask.cpp --- launcher/minecraft/update/FMLLibrariesTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp index a05a7c2a..8f1a43ff 100644 --- a/launcher/minecraft/update/FMLLibrariesTask.cpp +++ b/launcher/minecraft/update/FMLLibrariesTask.cpp @@ -58,7 +58,7 @@ void FMLLibrariesTask::executeTask() } // download missing libs to our place - setStatus(tr("Dowloading FML libraries...")); + setStatus(tr("Downloading FML libraries...")); auto dljob = new NetJob("FML libraries"); auto metacache = ENV.metacache(); for (auto &lib : fmlLibsToProcess)