Commit Graph

77 Commits

Author SHA1 Message Date
Sebastian-byte
984a5b86b8 Fix conflict 2021-12-10 18:07:09 -05:00
Dāvis Mosāns
663e6a313c Fix Microsoft account provider 2021-12-10 07:18:54 +02:00
Dāvis Mosāns
92e1a0fa08 Fix InjectAuthlib 2021-12-10 07:18:54 +02:00
Petr Mrázek
dba4c452e0 NOISSUE account tweaks 2021-12-08 01:22:57 +01:00
Petr Mrázek
825ef52dd5 NOISSUE fix up some corner cases around migrating accounts 2021-12-06 20:16:13 +01:00
Petr Mrázek
c8ca6acc15 NOISSUE fix some error mappings for Mojang accounts 2021-12-05 03:48:07 +01:00
Petr Mrázek
d37003b1de NOISSUE fix builds, make account refresh queue user friendly 2021-12-04 02:10:14 +01:00
Petr Mrázek
db6431d9e0 NOISSUE add missing chrono include 2021-12-04 01:27:58 +01:00
Petr Mrázek
3c46d8a412 GH-4071 Heavily refactor and rearchitect account system
This makes the account system much more modular
and makes it treat errors as something recoverable,
unless they come directly from the MSA refresh token
becoming invalid.
2021-12-04 01:18:05 +01:00
Petr Mrázek
285188ea53 GH-4071 handle network errors when logging in with MSA as 'soft'
This makes the tokens not expire when such errors happen.

Only applies to MSA, not the XBox and Mojang steps afterwards.
Further testing and improvements are still needed.
2021-11-28 18:42:01 +01:00
Sebastian-byte
95b8e17ae2 Fix another conflict 2021-11-23 19:57:06 -05:00
Petr Mrázek
b49987e876 NOISSUE fix fix fix the accounts again 2021-11-23 01:25:24 +01:00
Petr Mrázek
b258eac215 NOISSUE continue reshuffling the codebase 2021-11-22 03:55:16 +01:00
Petr Mrázek
9fc677c2a4 NOISSUE more refactoring 2021-11-21 23:36:55 +01:00
Petr Mrázek
69213b1206 NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Sebastian-byte
0cbae4aa38 Hopefully does some build fixes 2021-11-20 16:26:01 -05:00
Sebastian-byte
b7509c80bf Fix conflict 2021-11-20 14:35:57 -05:00
Petr Mrázek
0c861db7a2 NOISSUE Some happy little refactors 2021-11-20 16:22:22 +01:00
Sebastian
21d4b896cb Merge branch 'MultiMC:develop' into develop 2021-11-17 15:49:48 -05:00
Petr Mrázek
eafeb64dec NOISSUE qnam -> network 2021-11-17 13:20:50 +01:00
Sebastian
4a2580d0b7 Merge branch 'MultiMC:develop' into develop 2021-11-16 15:52:50 -05:00
Jamie Mansfield
014e65220e NOISSUE Error on launch when launching 1.18 with < Java 17 2021-11-16 18:25:16 +00:00
Petr Mrázek
6c82883206 NOISSUE fix account re-adding not updating current account 2021-11-16 02:21:59 +01:00
Sebastian
2b197f02ef Remove extra debug print 2021-11-11 17:21:48 -05:00
Sebastian
7106b5ca56 Attempt to fix build N°2 2021-11-11 15:44:07 -05:00
Sebastian
76b55593fc Attempt to fix build 2021-11-11 15:36:34 -05:00
Sebastian-byte
ff5e98ff7d Fix conflict 2021-11-11 15:26:27 -05:00
Petr Mrázek
25fbeb265a NOISSUE fix build some more 2021-11-10 03:16:04 +01:00
Petr Mrázek
30d5a7ab48 NOISSUE fix build 2021-11-10 03:12:01 +01:00
Petr Mrázek
475d949a1e GH-4217 Add support for GamePass accounts and MC profile setup
- We now use the new endpoint for loggiong in via XBox tokens (/launcher/login)
- We now check game entitlements instead of only relying on MC profile presence
- Accounts can now be added even when they do not have a profile
- The launcher will guide you through selecting a Minecraft name if you don't have one yet
2021-11-10 03:02:51 +01:00
Sebastian
6d22262602 Merge branch 'MultiMC:develop' into develop 2021-11-07 14:40:45 -05:00
Janrupf
0423464b88 GH-4227 Don't blindly trust mods.toml to be valid 2021-11-06 22:43:16 +01:00
max
deffca3b6f Some ui fixes 2021-11-05 10:31:18 +03:00
Sebastian-byte
8b1f246dc9 Fix conflict 2021-11-02 17:04:00 -05:00
max
4bd6716327 Fix windows builds 2021-11-01 20:44:56 +03:00
max
d522ad6ac4 Fix account saves, start fixing local 2021-11-01 20:30:25 +03:00
max
44c64a20c2 Fix ely by authentication 2021-11-01 17:01:15 +03:00
Petr Mrázek
27f276ef13 GH-1795 add terminal launch option to use a specific Minecraft profile
Used like this:
```
./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net
```
2021-10-31 21:43:33 +01:00
Sebastian-byte
dd5a930739 Fix conflict 2021-10-24 17:15:27 -05:00
Sebastian-byte
ea0d7951af Attempt to fix setProvider issue 2021-10-24 16:48:40 -05:00
Petr Mrázek
6f6c9c6f68 NOISSUE fix debranding changes affecting version file format 2021-10-24 12:25:44 +02:00
Jamie Mansfield
7cbca6ab20 NOISSUE Use common duration format for global and instances 2021-10-24 00:09:21 +01:00
Sebastian-byte
49c464ebf3 Fix conflicts 2021-10-21 17:57:41 -05:00
Petr Mrázek
5b3dffce62 NOISSUE continue debranding... 2021-10-21 00:47:53 +02:00
Petr Mrázek
441ab7eedc NOISSUE debranding for real, initial work
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
2021-10-21 00:47:53 +02:00
Sebastian
ffeb4d9ffa Merge branch 'MultiMC:develop' into develop 2021-10-03 15:13:57 -05:00
Petr Mrázek
8c4fb86ba0 Merge pull request #4103 from tobfos2611/develop
Fix underaged account that isn't linked to a family help link.
2021-10-03 21:59:46 +02:00
Petr Mrázek
668d31b79e Merge pull request #4143 from phit/patch-1
NOISSUE Remove outdated SSL docs
2021-10-03 21:52:13 +02:00
Petr Mrázek
3138e58c75 NOISSUE fix typo in FMLLibrariesTask.cpp 2021-10-03 21:46:10 +02:00
Philip T
0b312956db 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
2021-10-03 13:43:43 +02:00