External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 04:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,086 Commits 18 Branches 48 Tags
353669dc8ad8d2e034ffd5c5314e4405a74defdf
Commit Graph

47 Commits

Author SHA1 Message Date
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
Sebastian
297d982ddd Merge branch 'MultiMC:develop' into develop 2021-09-24 16:25:17 -05:00
Petr Mrázek
0f3cf0595b NOISSUE add shader pack page for instances 
Only theme with an icon is simple colored, rest is TBD
 2021-09-23 21:26:56 +02:00
Petr Mrázek
a5956194df NOISSUE Remove Requestor, it is unused 2021-09-21 22:02:12 +02:00
tobfos
28d7c5d309 Removed unnecessary text in link. 
Thanks @RDKRACZ.
 2021-09-15 20:46:07 +10:00
Toby Foster
7229ebbb08 Fix underaged account that isn't linked to a family help link. 2021-09-15 18:10:00 +10:00
Sebastian-byte
3ac634dad4 Fix provider system 2021-09-13 21:26:15 -05:00
Sebastian
f2e2a388f0 Finish removing LOGIC_EXPORT 2021-09-13 09:12:27 -05:00
Sebastian-byte
5321371464 Fix build 2021-09-12 21:06:38 -05:00
Sebastian-byte
871c5b5e38 Fix conflict again 2021-09-12 20:52:56 -05:00
Sebastian-byte
46df45ffcf Fix conflict 2021-09-12 20:23:30 -05:00
Petr Mrázek
e2355eb276 NOISSUE enable listing symlinks in mod/world lists 2021-09-09 00:27:46 +02:00
Petr Mrázek
878c4fb810 NOISSUE Provide dummy implementation for the secrets library 2021-09-05 18:23:49 +02:00
Petr Mrázek
938f896bfa GH-4014 change updater to recognize new Qt 5.15.2 builds 2021-09-04 21:27:09 +02:00
Petr Mrázek
23442442d8 GH-3392 fix a bunch of bugs and implement STS error states 2021-08-31 01:11:52 +02:00
Petr Mrázek
3171014301 GH-3392 checking for migration status and refresh button in accounts list 2021-08-29 22:55:33 +02:00
Petr Mrázek
7239502675 GH-3392 Add recognition of already migrated Mojang accounts 2021-08-29 19:59:18 +02:00
Petr Mrázek
b2c1100b1c NOISSUE introduce the concept of secrets static library 2021-08-27 22:35:17 +02:00
Petr Mrázek
34a5459dce NOISSUE cut down Requestor 2021-08-25 21:27:51 +02:00
Petr Mrázek
eae65da110 GH-3392 Switch MS account login to use device flow instead 
Device flow involves the user manually opening a web page and putting in
a code. We no longer need to interact with the browser.
 2021-08-22 20:01:18 +02:00
Petr Mrázek
1b68d51da6 NOISSUE add setting capes, tweak missing profile message, fix cape IDs 2021-08-20 01:34:32 +02:00
Petr Mrázek
94fd9a3535 NOISSUE fix linux builds 2021-08-19 10:27:30 +02:00
Petr Mrázek
345641f7d2 NOISSUE sanitize some MSA auth logging 2021-08-19 00:43:19 +02:00
Petr Mrázek
44d634f564 GH-3392 Fix strings in AuthContext and make them translateable 2021-08-15 23:40:37 +02:00
Petr Mrázek
3a53349e33 GH-3392 dirty initial MSA support that shares logic with Mojang flows 
Both act as the first step of AuthContext.
 2021-08-15 23:18:50 +02:00
Sebastian-byte
743314edf2 Fix conflict again 2021-07-26 17:27:04 -05:00
Sebastian-byte
65d3068e9f Fix conflict 2021-07-25 18:34:28 -05:00
Petr Mrázek
20b9f2b42a NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00