Commit Graph

26 Commits

Author SHA1 Message Date
Sebastian
b7c9b27ed6 Merge branch 'MultiMC:main' into main 2022-07-09 11:04:55 -05:00
xcfrg
346496c3fd fix: log file extension of mods to clear ambiguity 2022-07-08 23:28:03 -04:00
Sebastian
c75ae2b218 Merge remote-tracking branch 'upstream/develop' into develop 2022-05-21 18:29:00 -05:00
Jamie Mansfield
a28adf7b62 NOISSUE Match Vanilla launcher for launch arguments 2022-05-17 18:51:19 +01:00
Maftei Albert-Alexandru
4afe2466fd Actual fix for #135 (#154)
* Fix for #135 and fixes for other issues such as actually playing the game

* Removed accidentally added .vscode files

* Patchy patch
2022-01-24 20:58:54 -05:00
Petr Mrázek
94fdf13f4a NOISSUE proper fix for missing profile + demo mode 2021-12-30 21:26:29 +01:00
Sebastian
fc22ddd13d Merge branch 'MultiMC:develop' into develop 2021-12-13 19:11:57 -05:00
Petr Mrázek
7d047f9223 NOISSE add a shortcut to the loaders mods to main window 2021-12-12 22:39:25 +01:00
Dāvis Mosāns
92e1a0fa08 Fix InjectAuthlib 2021-12-10 07:18:54 +02:00
Sebastian-byte
95b8e17ae2 Fix another conflict 2021-11-23 19:57:06 -05: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-byte
dd5a930739 Fix conflict 2021-10-24 17:15:27 -05: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
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
Sebastian-byte
46df45ffcf Fix conflict 2021-09-12 20:23:30 -05: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
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