10 Commits

Author	SHA1	Message	Date
Sebastian-byte	8b1f246dc9	Fix conflict	2021-11-02 17:04:00 -05:00
max	d522ad6ac4	Fix account saves, start fixing local	2021-11-01 20:30:25 +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	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-byte	dd5a930739	Fix conflict	2021-10-24 17:15:27 -05:00
Jamie Mansfield	2e60413f7f	NOISSUE Add option to disable global play time status	2021-10-24 00:17:07 +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