Commit Graph

115 Commits

Author SHA1 Message Date
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
Jamie Mansfield
5bc6dd8f97 NOISSUE Remove lingering full stop in playtime status 2021-10-24 00:11:09 +01:00
Jamie Mansfield
7cbca6ab20 NOISSUE Use common duration format for global and instances 2021-10-24 00:09:21 +01:00
Petr Mrázek
110c73edf2 Merge pull request #4178 from jamierocks/qt-clear-button
NOISSUE Use Qt's clear button for ATLauncher page
2021-10-24 01:01:58 +02:00
Petr Mrázek
e6cb7b7710 Merge pull request #4177 from jamierocks/mch-search
NOISSUE Fix modpacks.ch search
2021-10-24 01:01:38 +02:00
ImperatorStorm
aed8d5f8f5 MultiMCGH-4120 Add manpage to ubuntu and rpm packages 2021-10-21 19:17:51 -07:00
Sebastian-byte
49c464ebf3 Fix conflicts 2021-10-21 17:57:41 -05:00
Petr Mrázek
8bc6560b5e NOISSUE fix translations 2021-10-21 23:27:01 +02:00
Petr Mrázek
7c86732a47 NOISSUE Update links to repo, fix up library README 2021-10-21 23:25:52 +02:00
Petr Mrázek
d9b46289a1 NOISSUE finish up the obvious parts of debranding
This is not absolutely complete, but reasonably so
2021-10-21 00:47:53 +02:00
Petr Mrázek
5b3dffce62 NOISSUE continue debranding... 2021-10-21 00:47:53 +02:00
Petr Mrázek
297d4b4196 NOISSUE continue the debranding 2021-10-21 00:47:53 +02:00
Petr Mrázek
e12a769800 NOISSUE fix windows rc file and mac icon 2021-10-21 00:47:53 +02:00
Petr Mrázek
462a44b4be GH-4011 fix license text missing from About dialog 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
Petr Mrázek
6a4130c914 NOISSUE re-align the status bar 2021-10-21 00:47:53 +02:00
Jamie Mansfield
3f0e729815 NOISSUE Use Qt's clear button for ATLauncher page
This replaces our 'Reset' button.
2021-10-17 20:18:18 +01:00
Jamie Mansfield
b93997501d NOISSUE Use Qt's clear button for modpacks.ch page
This replaces our 'Reset' button.
2021-10-17 20:14:16 +01:00
Jamie Mansfield
1869dd0de3 NOISSUE Search as you type for modpacks.ch
Since we just filter data locally now, this isn't painfully slow -
indeed it's very quick. This also matches other platforms, such as
ATLauncher.
2021-10-16 23:36:31 +01:00
Jamie Mansfield
175132539b NOISSUE Filter all pack's by name to search for modpacks.ch
modpacks.ch searching has changed, and while likely a bug - we may as
well make this change while we fetch all packs anyway. This makes MMC
more reactive for searchs for the platform.

This should be reverted if/when the modpacks.ch hits a size where we
need to restrict how many packs are fetched.
2021-10-16 23:31:27 +01:00
kb1000
fa7a7d52d0 Remove broken Mojang services status 2021-10-08 19:29:49 +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