External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 12:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,928 Commits 18 Branches 48 Tags
f7343a3c1b1feaf1c159bd66ea670cb30d7aa3ba
Commit Graph

2928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastían
f7343a3c1b Merge branch 'MultiMC:develop' into develop 2021-07-27 19:17:46 -05:00
Petr Mrázek
17af6d70b4 GH-3974 fix pinning to taskbar in various linux environments 2021-07-27 21:46:38 +02:00
Sebastian-byte
5385277ef8 Merge branch 'MultiMC-develop' into develop 2021-07-26 17:27:40 -05:00
Sebastian-byte
743314edf2 Fix conflict again 2021-07-26 17:27:04 -05:00
Petr Mrázek
d2de849c86 NOISSUE set the required defs for main library 2021-07-26 14:03:59 +02:00
Sebastian-byte
65d3068e9f Fix conflict 2021-07-25 18:34:28 -05:00
Petr Mrázek
7921f47ec4 NOISSUE loosen requirements on CMake version in katabasis 2021-07-25 19:50:44 +02:00
Petr Mrázek
20b9f2b42a NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
Petr Mrázek
dd13368085 NOISSUE bulk addition of code from Katabasis 2021-07-25 19:50:44 +02:00
Petr Mrázek
2568752af5 Merge pull request #3961 from phit/patch-1 
GH-3939 fix suggestion template
 2021-07-25 18:16:47 +02:00
Sebastian-byte
9069e9c9d0 Merge branch 'MultiMC-develop' into develop 2021-07-23 16:35:40 -05:00
Sebastian-byte
c908c1b5ef Fix conflict 2021-07-23 16:34:31 -05:00
Philip T
fbd93a47a3 GH-3939 fix suggestion template 2021-07-23 20:41:23 +02:00
Petr Mrázek
0c466bc530 Merge pull request #3919 from hamarb123/develop 
Stop application freezes on macOS by moving data to MultiMC.app/Data
 2021-07-23 16:13:32 +02:00
Petr Mrázek
b902c5cd78 Merge pull request #3956 from jamierocks/block-forge-117-install 
NOISSUE Disable Install Forge button on 1.17 (and above)
 2021-07-23 13:41:23 +02:00
Petr Mrázek
78124f6fba Merge pull request #3958 from jamierocks/fix-3957 
GH-3957 Fix 'Add Instance' label
 2021-07-22 22:34:07 +02:00
Jamie Mansfield
34f74fff0a GH-3957 Fix 'Add Instance' label 2021-07-22 21:21:17 +01:00
Jamie Mansfield
211cfb4af7 NOISSUE Disable Install Forge button on 1.17 (and above) 
It appears that Minecraft Forge for Minecraft 1.17 will require setting
JVM arguments to operate, this is not currently possible with MultiMC's
meta.

Therefore, when Forge for 1.17 is released a solution will need to be
looked into.
 2021-07-22 20:50:58 +01:00
Petr Mrázek
c5d0348181 NOISSUE Fix minutes display for total playtime 2021-07-22 21:18:03 +02:00
Leland Liu
1762d2fc7d Added total playtime 2021-07-22 20:26:59 +02:00
Petr Mrázek
8ea500de68 Merge pull request #2997 from ChrisLane/man-page 
Add man page doc
 2021-07-22 18:18:40 +02:00
Petr Mrázek
9e9281f06e Merge pull request #3728 from jamierocks/sort-languages 
NOISSUE Sort languages alphabetically by their key
 2021-07-22 18:15:46 +02:00
Petr Mrázek
6f12b31ead Merge pull request #3299 from QazCetelic/develop 
Update instance icons, using the newer minecraft textures
 2021-07-22 17:56:18 +02:00
Petr Mrázek
3974f12643 Merge pull request #3831 from kb-1000/rpm-cleanup 
NOISSUE Some cleanups of the RPM package
 2021-07-22 17:42:30 +02:00
Petr Mrázek
66fc707105 Merge pull request #3903 from Sebastian-byte/patch-1 
NOISSUE: Fix typo and remove SSH URL
 2021-07-22 17:41:16 +02:00
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