Commit Graph

3071 Commits

Author SHA1 Message Date
max
5683bfe22d And chage name to UltimMC 2021-11-05 11:17:15 +03: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
8e4cc6700c Merge branch 'MultiMC-develop' into develop 2021-11-02 17:04:43 -05: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
f6a0dbf895 Update CI 2021-10-25 18:23:44 -05: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
Petr Mrázek
f11d68e2a2 Merge pull request #4197 from Sebastian-byte/patch-1
NOISSUE Fix typo making Windows build fail
2021-10-25 05:48:27 +02:00
Sebastian
73995106d3 NOISSUE Fix typo making Windows build fail 2021-10-24 18:16:00 -05:00
Sebastian
18c7991d16 Use correct executable name 2021-10-24 17:58:42 -05:00
Sebastian-byte
c6da434a87 Add files to compilation 2021-10-24 17:47:40 -05:00
Sebastian-byte
8543b99102 Merge branch 'MultiMC-develop' into develop 2021-10-24 17:15:30 -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
Petr Mrázek
45520129d9 Merge pull request #4193 from jamierocks/modpack-name-version
Include modpack version in the default instance title
2021-10-24 02:03:03 +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
Petr Mrázek
cbe1b3353c Merge pull request #4172 from jamierocks/global-playtime
NOISSUE Add option to disable global play time status
2021-10-24 01:21:26 +02:00
Jamie Mansfield
2e60413f7f NOISSUE Add option to disable global play time status 2021-10-24 00:17:07 +01:00
Petr Mrázek
98887911c1 Merge pull request #4173 from jamierocks/common-time-duration-format
NOISSUE Use common duration format for global and instances
2021-10-24 01:11:52 +02: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
ddf98c59f5 Merge pull request #4184 from kb-1000/update-repo-links
NOISSUE Update repository links
2021-10-24 01:09:11 +02: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
b36f795380 Merge branch 'MultiMC-develop' into develop 2021-10-21 17:58:07 -05: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
a8458e36ff NOISSUE remove extra file 2021-10-21 02:07:29 +02:00
kb1000
8bc5b5a01f NOISSUE Update repository links 2021-10-21 01:46:13 +02:00
Petr Mrázek
264d3017aa NOISSUE update notsecrets README.md 2021-10-21 01:11:08 +02:00