Commit Graph

138 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
max
ff8c2aab1b Merge branch 'develop' of github.com:AfoninZ/MultiMC5-Cracked into develop 2021-11-04 21:53:58 +03:00
max
a6dc172799 Rewrite http auth server 2021-11-04 21:53:51 +03:00
Sebastian
744db9bf0f Merge branch 'MultiMC:develop' into develop 2021-11-03 17:16:28 -05:00
Petr Mrázek
7b4c52e1e3 NOISSUE fix some small build issues 2021-11-03 15:45:42 +01: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
Petr Mrázek
393d17b8d3 GH-4164 set instance drag image hotspot based on where the drag started 2021-10-27 10:25:18 +02:00
Sebastian
180eae3d2b Merge branch 'MultiMC:develop' into develop 2021-10-25 17:00:25 -05:00
Petr Mrázek
ae4939e0d2 GH-4164 Assign instances to groups using drag & drop 2021-10-25 23:51:42 +02:00
Sebastian
d804081d48 Merge branch 'MultiMC:develop' into develop 2021-10-25 14:44:45 -05:00
Petr Mrázek
85ecbad467 GH-3490 sort instances by name is now aware of numbers 2021-10-25 21:43:00 +02:00
Petr Mrázek
040af58070 NOISSUE add more logging when java checker fails to start 2021-10-25 12:01:08 +02:00
Sebastian-byte
c6da434a87 Add files to compilation 2021-10-24 17:47:40 -05:00
Sebastian-byte
dd5a930739 Fix conflict 2021-10-24 17:15:27 -05:00
Sebastian-byte
9a26dcba9a Attempt to fix RadioButton issue 2021-10-24 17:05:55 -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
Petr Mrázek
7f28f0bf01 Merge pull request #4186 from ImperatorStorm/addman
MultiMCGH-4120 Add manpage to ubuntu and rpm packages
2021-10-24 02:51:37 +02:00
Jamie Mansfield
41d855fd11 GH-4185 Include the modpack version in instance title for ATLauncher 2021-10-24 00:39:42 +01:00
Jamie Mansfield
4b13577a59 GH-4185 Include the modpack version in instance title for modpacks.ch 2021-10-24 00:39:02 +01:00
Jamie Mansfield
c377ad6025 NOISSUE Use MiB suffix for memory and permgen 2021-10-24 00:26:37 +01:00
Jamie Mansfield
a6df7d709f NOISSUE Correct spelling of miscellaneous 2021-10-24 00:26:16 +01:00
Jamie Mansfield
2e60413f7f NOISSUE Add option to disable global play time status 2021-10-24 00:17:07 +01:00