Commit Graph

3303 Commits

Author SHA1 Message Date
Petr Mrázek
4fc37f5a35 Merge pull request #3931 from jamierocks/july-wrk2
NOISSUE Debranding, fix annoying warning, updated Patreon logo
2021-07-22 17:40:36 +02:00
Petr Mrázek
295bcbe3a7 Merge pull request #3952 from Tkain/windows-icon-fix
NOISSUE: Fix Windows icon scaling issues
2021-07-22 17:40:16 +02:00
Thomas Kain
4b3305afbe Fix Windows icon scaling issues
Recalculated the icon using the official logo SVG and GIMP.
Appears visually identical to the old one at all resolutions.
2021-07-21 13:46:21 -04:00
Sebastían
9cab395f1c Update CMake version 2021-07-14 18:56:46 -05:00
Sebastían
f2c0959fcf Build on push 2021-07-13 20:16:53 -05:00
Sebastían
d0c42b1d46 Remove trailing whitespace 2021-07-13 19:52:00 -05:00
Sebastian-byte
59ffdc8ff6 Revert all the disaster 2021-07-13 19:50:52 -05:00
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
Jamie Mansfield
74f5255eef GH-3930 Track duration of previous game sessions 2021-07-13 17:01:53 +01:00
Jamie Mansfield
d63ef939be NOISSUE Update Patreon logo
The logo was taken from Patreon's brand assets [1] archive, and shrunk
to size with KolourPaint.

[1] https://www.patreon.com/brand
2021-07-13 16:02:04 +01:00
Jamie Mansfield
66fde9e6b7 NOISSUE Correct trending URL string for Technic packs
This seems to have just been an inadvertent mistake when copy-pasting.
This commit just removes an annoying warning.
2021-07-13 15:42:44 +01:00
Jamie Mansfield
4401b9e137 NOISSUE Specify Imgur client ID at build time 2021-07-13 15:15:42 +01:00
Jamie Mansfield
20c393321c NOISSUE Use constants for user agents
Here lies yet another early-stage move to debrand the MultiMC codebase,
as well as reducing the burden of updating strings across the codebase
for a future MultiMC6.
2021-07-13 15:15:33 +01:00
Hamish Arblaster
e883cf2359 GH-2529 Move data path on macOS to MultiMC.app/Data
macOS seems to dislike changing files in the APPBUNDLE.app/Contents directory because it has to re-scan the directory every launch. As a result, large amounts of data there seems to cause freezes of MultiMC. Moving the default location outside of this directory, and thus the data, stops these freezes.
There is also a dialogue when the user first opens the app that asks them if they'd like to migrate their data folder, if they select yes it will move it, and if they select no it will not move it and allow them to move it later with an option in settings.
2021-07-11 09:36:21 +10: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
Sebastían
665b9213c6 NOISSUE Fix typo and remove SSH URL 2021-06-25 20:15:19 -05: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