Merge remote-tracking branch 'original/develop' into develop

CMakeLists.txt

@@ -55,7 +55,7 @@ set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fet
 ######## Set version numbers ########
 set(Launcher_VERSION_MAJOR    0)
 set(Launcher_VERSION_MINOR    6)
-set(Launcher_VERSION_HOTFIX   13)
+set(Launcher_VERSION_HOTFIX   14)
 
 # Build number
 set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")

changelog.md

@@ -1,12 +1,77 @@
-# MultiMC 0.6.13
+# MultiMC 0.6.14
+
+This further refines Microsoft account support, along with small fixes related to modpack platforms and Java runtime detection.
+
+It's also been 10 years since the first release of MultiMC. All background cats are now ready to party!
+
+### Microsoft accounts
+
+The account system now refreshes accounts in the background while the application is running.
+
+- GH-4071: Errors encountered while refreshing account tokens no longer always result in the tokens expiring:
+  - Network errors encountered when refreshing the main account tokens result in the account being **Offline**.
+  - **Hard** errors are produced by the main tokens becoming provably invalid.
+  - Errors encountered later are treated as **Soft** - they do make the account unusable, but still recoverable by trying again.
+  - **Soft** errors are treated as **Hard** errors when adding the account initially.
+
+In general, this should make MultiMC much more forgiving towards various temporary and non-fatal errors.
+
+- GH-4217: Added support for GamePass accounts and Minecraft profile setup:
+  - The new endpoint for logging in with Microsoft is now used (`/launcher/login`), enabling compatibility with GamePass.
+  - Game ownership is checked instead of only relying on Minecraft profile presence.
+  - Accounts can now be added even when they do not have a profile.
+  - The launcher should guide you through selecting a Minecraft name if you don't have one yet.
+
+### Modpack platform changes
+
+- GH-4055: MultiMC now tries to avoid downloading multiple files to the same path for FTB modpacks.
+
+- Search as you type is now used for FTB.
+
+- GH-4185: Version of the modpack is now included in the name of the instance by default.
+
+- The modpack platform UIs now include text field clear buttons.
+
+### Other changes
+
+- Adjusted warnings about Java runtime required for Minecraft 1.18 (it's not Java 16, it's Java 17).
+
+- GH-3490: Instance sorting is now aware of numbers (and sorts 99 before 100).
+
+- GH-4164: Reimplemented assigning instances to groups using drag & drop.
+
+- GH-1795: Added terminal launch option to use a specific Minecraft profile (in-game player name).
+
+    Used like this:
+    ```
+    ./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net
+    ```
+
+- GH-4227: Fix crash related to invalid Forge mod metadata.
+
+- GH-4200: Search for the *Eclipse Foundation* and *Adoptium* Java runtimes in the Windows Registry.
+
+- Added shader packs page to instances.
+
+- Removed Mojang services status information from the main window - the status is no longer provided by Mojang.
+
+- It is now possible to turn of global tracking of play time.
+
+### Technical changes
+
+- Debranding is mostly finished. You may see some changes in the logo being used in less places.
+
+# Previous releases
+
+## MultiMC 0.6.13
 
 This release brings initial support for Microsoft accounts, along with a nice pile of modpack platform support changes and improved Java runtime detection.
 
 Java runtimes still need an overhaul, so we're staying on the 0.6 version for a little longer.
 
 Next release should also tackle the current Forge 1.17.x issues in a systematic way.
 
-### Microsoft accounts
+#### Microsoft accounts
 
 This is the first release with Microsoft accounts in.
 
@@ -24,7 +89,7 @@ As part of this, the skin fetching no longer uses a third party service and inst
 
 Capes can also be selected in MultiMC now. With how many people will now get one for migrating their accounts, it only makes sense.
 
-### macOS update
+#### macOS update
 
 Because of issues with the Microsoft accounts, we now have two builds on macOS:
 
@@ -36,7 +101,7 @@ MultiMC will update to the 5.15.2 builds when it detects that this is possible.
 
 Similar approach got attempted on Windows, aiming to fix various display scaling and theming issues, but it ran into too many problems and will be attempted later, with more caution.
 
-### Modpack platforms
+#### Modpack platforms
 
 In general, the modpack platform pages have been made more consistent with each other (GH-3118, GH-3720, GH-3731).
 
@@ -77,7 +142,7 @@ In general, the modpack platform pages have been made more consistent with each
 
 - Fixed bugs in FTB platform search.
 
-### Other changes
+#### Other changes
 
 - Forge installation is disabled on Minecraft 1.17+ because of incompatible/unresolved changes on the Forge side.
 
@@ -117,11 +182,10 @@ In general, the modpack platform pages have been made more consistent with each
 
 - Quick and dirty minimum Java runtime versions checks have been added. This needs to be expanded in the future.
 
-### Technical changes
+#### Technical changes
 
 - The codebase continues to move towards being debranded and harder to build as 'MultiMC' for third parties.
 
-# Previous releases
 
 ## MultiMC 0.6.12
 

launcher/Application.cpp

@@ -827,6 +827,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         qDebug() << "Loading accounts...";
         m_accounts->setListFilePath("accounts.json", true);
         m_accounts->loadList();
+        m_accounts->fillQueue();
         qDebug() << "<> Accounts loaded.";
     }
 

launcher/CMakeLists.txt

@@ -196,36 +196,52 @@ set(ICONS_SOURCES
 # Support for Minecraft instances and launch
 set(MINECRAFT_SOURCES
     # Minecraft support
-    minecraft/auth/AccountData.h
     minecraft/auth/AccountData.cpp
-    minecraft/auth/AccountTask.h
+    minecraft/auth/AccountData.h
+    minecraft/auth/AccountList.cpp
+    minecraft/auth/AccountList.h
     minecraft/auth/AccountTask.cpp
-    minecraft/auth/AuthSession.h
+    minecraft/auth/AccountTask.h
+    minecraft/auth/AuthRequest.cpp
+    minecraft/auth/AuthRequest.h
     minecraft/auth/AuthSession.cpp
-    minecraft/auth/AccountList.h
-    minecraft/auth/AccountList.cpp
-    minecraft/auth/MinecraftAccount.h
+    minecraft/auth/AuthSession.h
+    minecraft/auth/AuthStep.cpp
+    minecraft/auth/AuthStep.h
     minecraft/auth/MinecraftAccount.cpp
-    minecraft/auth/flows/AuthContext.h
-    minecraft/auth/flows/AuthContext.cpp
-    minecraft/auth/flows/AuthRequest.h
-    minecraft/auth/flows/AuthRequest.cpp
-
-    minecraft/auth/flows/MSAInteractive.h
-    minecraft/auth/flows/MSAInteractive.cpp
-    minecraft/auth/flows/MSASilent.h
-    minecraft/auth/flows/MSASilent.cpp
-
-    minecraft/auth/flows/MojangLogin.h
-    minecraft/auth/flows/MojangLogin.cpp
-    minecraft/auth/flows/MojangRefresh.h
-    minecraft/auth/flows/MojangRefresh.cpp
-
-    minecraft/auth/flows/Yggdrasil.h
-    minecraft/auth/flows/Yggdrasil.cpp
-
-    minecraft/auth/flows/Parsers.h
-    minecraft/auth/flows/Parsers.cpp
+    minecraft/auth/MinecraftAccount.h
+    minecraft/auth/Parsers.cpp
+    minecraft/auth/Parsers.h
+    minecraft/auth/Yggdrasil.cpp
+    minecraft/auth/Yggdrasil.h
+
+    minecraft/auth/flows/AuthFlow.cpp
+    minecraft/auth/flows/AuthFlow.h
+    minecraft/auth/flows/Mojang.cpp
+    minecraft/auth/flows/Mojang.h
+    minecraft/auth/flows/MSA.cpp
+    minecraft/auth/flows/MSA.h
+
+    minecraft/auth/steps/EntitlementsStep.cpp
+    minecraft/auth/steps/EntitlementsStep.h
+    minecraft/auth/steps/GetSkinStep.cpp
+    minecraft/auth/steps/GetSkinStep.h
+    minecraft/auth/steps/LauncherLoginStep.cpp
+    minecraft/auth/steps/LauncherLoginStep.h
+    minecraft/auth/steps/MigrationEligibilityStep.cpp
+    minecraft/auth/steps/MigrationEligibilityStep.h
+    minecraft/auth/steps/MinecraftProfileStep.cpp
+    minecraft/auth/steps/MinecraftProfileStep.h
+    minecraft/auth/steps/MSAStep.cpp
+    minecraft/auth/steps/MSAStep.h
+    minecraft/auth/steps/XboxAuthorizationStep.cpp
+    minecraft/auth/steps/XboxAuthorizationStep.h
+    minecraft/auth/steps/XboxProfileStep.cpp
+    minecraft/auth/steps/XboxProfileStep.h
+    minecraft/auth/steps/XboxUserStep.cpp
+    minecraft/auth/steps/XboxUserStep.h
+    minecraft/auth/steps/YggdrasilStep.cpp
+    minecraft/auth/steps/YggdrasilStep.h
 
     minecraft/gameoptions/GameOptions.h
     minecraft/gameoptions/GameOptions.cpp