Commit Graph

2880 Commits

Author SHA1 Message Date
Sebastian-byte
869a92b2a2 Revert "Merge pull request #9 from MultiMC/develop"
This reverts commit ccc86e4e02, reversing
changes made to 306c655ab5.
2021-07-13 19:44:51 -05:00
Sebastían
5019fafeb7 Merge branch 'develop' into develop 2021-07-13 19:31:59 -05:00
Sebastían
ccc86e4e02 Merge pull request #9 from MultiMC/develop
Update MultiMC5 Base
2021-07-13 19:27:53 -05:00
Sebastian-byte
dd3479e882 Revert "Disable build on push, closes #36"
This reverts commit e19730d3ba.
Nightly.link ignores manual builds.
2021-07-08 16:40:21 -05:00
Mateo Pidal
306c655ab5 Merge pull request #10 from PibePlayer/ubuntu_18.04
Ubuntu 18.04
2021-07-07 01:03:28 -03:00
Sebastían
6429456b74 Update main.yml 2021-07-06 20:29:45 -05:00
Sebastían
55bb5accab Remove comment 2021-07-06 20:19:33 -05:00
Sebastían
07fe7b64dc Adapt build system directories 2021-07-06 20:10:05 -05:00
Sebastían
5c7e38135f Merge branch 'MultiMC:develop' into develop 2021-07-06 19:52:27 -05:00
Petr Mrázek
df1d3dbae2 Merge pull request #3925 from jamierocks/fix-1949
GH-1949 Allow modpack downloads to be aborted
2021-07-06 22:01:33 +02:00
Zakhar Afonin
b3e7b0628b Update README.md
Linked build artifacts for Windows and Linux builds
2021-07-06 20:06:33 +03:00
Jamie Mansfield
220971fadd GH-1949 Allow ATLauncher pack downloads to be aborted 2021-07-06 15:22:41 +01:00
Jamie Mansfield
d5c4489313 GH-1949 Allow Technic pack downloads to be aborted
This supports both 'single zip' modpacks and Solder packs, through the
Technic mod platform page.
2021-07-06 15:22:26 +01:00
Jamie Mansfield
db392b4994 GH-1949 Allow modpacks.ch pack downloads to be aborted 2021-07-06 15:12:07 +01:00
Jamie Mansfield
d1a142f040 GH-1949 Allow Legacy FTB pack downloads to be aborted
It looks like this was just an mistake when implementing support for
legacy FTB.
2021-07-06 15:10:35 +01:00
Sebastían
e22e4e28cb Change Ubuntu to 18.04 2021-07-05 15:36:00 -05:00
Sebastían
ce90c2ec78 Merge branch 'MultiMC:develop' into develop 2021-07-01 20:04:00 -05:00
Mateo Pidal
d8d05bd761 Forgot to change the most important thing 2021-06-30 21:01:39 -03:00
Mateo Pidal
9478b7fb30 Support old Ubuntu Builds 2021-06-30 20:47:42 -03:00
Petr Mrázek
417994735a Merge pull request #3914 from jamierocks/mch-check-checksums
NOISSUE Cache modpacks.ch files and check their checksums
2021-06-30 17:25:50 +02:00
Jamie Mansfield
2e78b64058 NOISSUE Fix detection for 32-bit Azul or Bellsoft Java
Co-authored-by: Pedro Cunha <pedroagracio@gmail.com>
2021-06-30 00:54:19 +01:00
Sebastían
c647ddb124 Update download links 2021-06-28 18:47:54 -05:00
Jamie Mansfield
c15bd655f1 NOISSUE Cache file downloads for modpacks.ch 2021-06-28 22:36:32 +01:00
Jamie Mansfield
f51efc9109 NOISSUE Verify file checksums for modpacks.ch 2021-06-28 22:09:52 +01:00
Sebastian-byte
6d6218a21b Fix indent in some other files 2021-06-25 20:00:40 -05:00
Sebastian-byte
9bc4a1241c Fix indent 2021-06-25 19:46:20 -05:00
Sebastian-byte
d28e643ab2 Merge branch 'MultiMC-develop' into develop 2021-06-25 18:47:00 -05:00
Sebastian-byte
b7ce6a63dc Resolved merge conflict 2021-06-25 18:46:21 -05:00
Petr Mrázek
dc3a4cebce Merge pull request #3896 from jamierocks/mib-suffix
NOISSUE Use MiB suffix for Java memory options
2021-06-25 12:27:57 +02:00
Petr Mrázek
d92733feae Merge pull request #3897 from jamierocks/atl-opt-mod-install-btn
NOISSUE Close optional mod dialog with Install button
2021-06-25 12:20:27 +02:00
Jamie Mansfield
a20a7e987f NOISSUE Fail launch if minimum Java requirement is not met
This will fail launch in the following conditions:
  1. A version greater than or equal to Minecraft 17w13a, and less than
     21w19a - and the Java version is less than 8.
  2. A version greater than or equal to Minecraft 21w19a - and the Java
     version is less than 16.
2021-06-23 21:24:25 +01:00
Jamie Mansfield
7c0fdaa730 NOISSUE Check mod and config checksums for ATLauncher 2021-06-23 18:20:25 +01:00
Jamie Mansfield
c77f5285e3 NOISSUE Close optional mod dialog with Install button
This was a silly ommision I made.
2021-06-23 15:49:31 +01:00
Jamie Mansfield
d8598d6901 NOISSUE Use MiB suffix for Java memory options 2021-06-23 09:57:55 +01:00
Sebastían
42f29a9f29 Merge branch 'MultiMC:develop' into develop 2021-06-22 16:45:48 -05:00
Petr Mrázek
27d3ae145a Merge pull request #3888 from jamierocks/atl-version-selection-width
NOISSUE Fix ATLauncher version selection combo box width
2021-06-22 19:57:49 +02:00
Petr Mrázek
5479fbec92 Merge pull request #3819 from jamierocks/atl-optional-mods
NOISSUE Support ATLauncher optional mods
2021-06-22 19:55:53 +02:00
Petr Mrázek
bc2c6cf030 Merge pull request #3893 from colbiedison/detect_jdks_in_opt
[Linux] Add detection of manually installed JDKs in /opt
2021-06-22 19:14:37 +02:00
Colbie Dison
ba8af797a9 Add detection of manually installed JDKs in /opt 2021-06-22 11:56:05 -05:00
max
04f580b0bc Fix launch offline 2021-06-22 11:22:30 +03:00
max
5beb7edfff Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2021-06-22 09:50:07 +03:00
Jamie Mansfield
4ba0c9c298 NOISSUE Support mod grouping and dependencies 2021-06-21 16:29:16 +01:00
Jamie Mansfield
74311a54cf NOISSUE Support ATLauncher optional mods 2021-06-21 16:29:11 +01:00
Jamie Mansfield
a87c64d7d1 NOISSUE Fix ATLauncher version selection combo box width
Resolves a bug that was introduced with [1], furthermore and in
specific relation to the intent of said commit, this brings the
version selection combo box inline with other mod platforms.

[1] f7c144c393
2021-06-21 15:26:10 +01:00
Petr Mrázek
8179a89103 Merge pull request #3886 from phit/fixftblegacy
NOISSUE Fix FTB Legacy Pack Selection
2021-06-21 00:46:16 +02:00
phit
e439ce6e0b NOISSUE Fix Modplatform Scrollbars properly 2021-06-20 22:59:58 +02:00
phit
f6d6e4c1c4 NOISSUE Fix FTB Legacy Pack Selection 2021-06-20 22:52:10 +02:00
Petr Mrázek
bace6fec1b Merge pull request #3880 from phit/fix/GH-3720
GH-3720 Fix UI inconsistencies with Modplatforms
2021-06-20 22:39:03 +02:00
Petr Mrázek
a487234968 Revert "GH-3507 Modernize MacOS Icon"
This reverts commit d08a2f00a2.
2021-06-20 21:53:02 +02:00
phit
f7c144c393 GH-3720 Fix UI inconsistencies with Modplatforms
Fixes GH-3118
Fixes GH-3720
Fixes GH-3731

Icons and Ok button state will now switch consistently when moving
between tabs. ATLaunchers packlist is now no longer redownloaded
each time you open its Tab. All lists are striped now. And all
search and filter fields now have a placeholder text.
2021-06-20 01:03:17 +02:00