Commit Graph

3276 Commits

Author SHA1 Message Date
Petr Mrázek
859d710581 GH-4071 handle invalid MSA refresh token as a hard error 2021-11-28 19:01:21 +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
Petr Mrázek
0e31f77468 Merge pull request #4283 from khenriks/fixicon
Install launcher icns to correct file name
2021-11-28 13:10:15 +01:00
K Henriksson
024f5952ce Install launcher icns to correct file name 2021-11-25 15:14:28 -08:00
Sebastian-byte
ee46b67d09 Merge branch 'MultiMC-develop' into develop 2021-11-23 19:59:03 -05:00
Sebastian-byte
95b8e17ae2 Fix another conflict 2021-11-23 19:57:06 -05:00
Petr Mrázek
a522cad6d6 NOISSUE also undo the AUTORCC change because it was also broken
It broke 32bit linux builds...
2021-11-23 01:37:13 +01:00
Petr Mrázek
b49987e876 NOISSUE fix fix fix the accounts again 2021-11-23 01:25:24 +01:00
Petr Mrázek
27e328c044 NOISSUE Do not rely on AUTOUIC
It is bugged and does not detect changes in .ui files, which makes development painful.
2021-11-22 14:29:38 +01:00
Petr Mrázek
b258eac215 NOISSUE continue reshuffling the codebase 2021-11-22 03:55:16 +01:00
Petr Mrázek
5040231f8d NOISSUE fix build on macOS 2021-11-21 23:42:55 +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
Abhay
b3412ca15c Update launcher icon (#106)
* Update launcher icon

* Added logo as SVG.

* Removed PNG.

Co-authored-by: Abhay <abdu@abhays-macbook-air.local>
2021-11-20 14:49:18 -05:00
Sebastian-byte
f2f9ded41d Merge branch 'MultiMC-develop' into develop 2021-11-20 14:37:14 -05:00
Sebastian-byte
b7509c80bf Fix conflict 2021-11-20 14:35:57 -05:00
Petr Mrázek
c2c56a2f6c NOISSUE fix build 2021-11-20 17:08:34 +01:00
Petr Mrázek
0c861db7a2 NOISSUE Some happy little refactors 2021-11-20 16:22:22 +01:00
Samisafool
66bb7105db misc stuff (#99)
* Remove more mojang account references where they don't belong

I forgor 💀 to put this in the last PR

* Update README.md

* Change patreon button to "Support MultiMC" instead of "Support UltimMC"

* requested changes
2021-11-18 01:28:28 -05: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
Petr Mrázek
0022aed8bb Merge pull request #4254 from jamierocks/java-17-requirement
NOISSUE Error on launch when launching 1.18 with < Java 17
2021-11-16 19:33:36 +01: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
985b7a6b03 Merge pull request #96 from Samisafool/patch-1
Change "Add Mojang" to "Add Account"
2021-11-13 18:02:10 -05:00
Samtheprogrammer
b980663a23 Change "Add Mojang" to "Add Account" 2021-11-12 11:26:30 +05:30
Sebastian
2b197f02ef Remove extra debug print 2021-11-11 17:21:48 -05:00
Sebastian
51bbc4f502 Remove unneeded package from build 2021-11-11 16:53:33 -05:00
Sebastian
667d0b537a Remove unneeded path changes in build 2021-11-11 16:29:59 -05:00
Sebastian
ec0f4221ec Minor build changes 2021-11-11 16:20:12 -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
84bc0d2086 Merge branch 'MultiMC-develop' into develop 2021-11-11 15:26:58 -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
353669dc8a Merge branch 'MultiMC:develop' into develop 2021-11-09 12:39:05 -05:00
Petr Mrázek
32f9c61c6e Merge pull request #4233 from ImperatorStorm/update-man
NOISSUE Update manpage to include new `-a / --profile` option.
2021-11-08 20:05:04 +01:00
Petr Mrázek
86f6a3e751 Merge pull request #4231 from NewoIsTaken/patch-2
GH-4200 Search Eclipse Foundation and Adoptium in Registry
2021-11-08 20:03:08 +01:00
ImperatorStorm
9ccce62f50 NOISSUE Update manpage to include new -a / --profile option. 2021-11-07 20:48:15 -08:00
Owen Wang
0660768478 GH-4200 Search Eclipse Foundation and Adoptium in Registry 2021-11-07 21:35:43 -05:00
Owen Wang
b1beeee11f GH-4224 Scan 64 bit lib directory to find Java 2021-11-07 21:19:35 -05:00
Sebastian
6d22262602 Merge branch 'MultiMC:develop' into develop 2021-11-07 14:40:45 -05:00
Sebastian
ac69560153 Merge pull request #91 from Samisafool/patch-2
Fix build artifacts having "MultiMC" folder name
2021-11-07 02:03:13 -05:00
Petr Mrázek
30602363d7 Merge pull request #4229 from Janrupf/develop
GH-4227 Don't crash when mods.toml is invalid
2021-11-06 23:07:23 +01:00
Janrupf
0423464b88 GH-4227 Don't blindly trust mods.toml to be valid 2021-11-06 22:43:16 +01:00
Janrupf
2576a28f73 NOISSUE Exclude run directory 2021-11-06 22:20:26 +01:00