Commit Graph

22 Commits

Author SHA1 Message Date
Samisafool
8d25c988c1 Fix build 2022-05-22 10:29:12 +05:30
Sebastian
c75ae2b218 Merge remote-tracking branch 'upstream/develop' into develop 2022-05-21 18:29:00 -05:00
Jamie Mansfield
cbcd822e44 NOISSUE Add missing licence headers to files I've authoured 2022-02-21 19:38:41 +00:00
Petr Mrázek
94fdf13f4a NOISSUE proper fix for missing profile + demo mode 2021-12-30 21:26:29 +01:00
Graeme Geldenhuys
fce98f5e16 Fixes compilation error expanding from macro 'major'. 2021-12-12 11:45:58 +00:00
Graeme Geldenhuys
7179e75e70 Changes required to support FreeBSD 2021-12-12 11:39:36 +00: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
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
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
Sebastian-byte
8b1f246dc9 Fix conflict 2021-11-02 17:04:00 -05: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
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-byte
871c5b5e38 Fix conflict again 2021-09-12 20:52:56 -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