mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-30 02:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
8720 commits 19 branches 53 tags 60 MiB
Commit graph

8720 commits

This branch
This branch
All branches
Author SHA1 Message Date
maskers
c8c3370d36 fix off by one error 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 6a12c43c78)
 2025-01-17 06:50:00 +00:00
TheKodeToad
cffa9a2da0 Confirm Truncate -> Truncation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 43fc9ba932)
 2025-01-17 06:50:00 +00:00
maskers
01397896eb don't mention prism in the middle of the log 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 762d24bd02)
 2025-01-17 06:50:00 +00:00
maskers
3048e43900 apply suggestion from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
(cherry picked from commit a910337e9d)
 2025-01-17 06:50:00 +00:00
maskers
417bb2fce6 fix formatting 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 6d017b5f0b)
 2025-01-17 06:50:00 +00:00
maskers
e234c66818 add a Cancel option 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
(cherry picked from commit 65f8526152)
 2025-01-17 06:50:00 +00:00
maskers
589ee73bfd Apply suggestions from code review 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
(cherry picked from commit 99bd4a8937)
 2025-01-17 06:50:00 +00:00
maskers
0cb5ac7a06 add a warning about the log being too large 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit cf914526bf)
 2025-01-17 06:50:00 +00:00
maskers
db35f47105 fix formatting 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 858f6aa9b8)
 2025-01-17 06:50:00 +00:00
maskers
cf8a82e78a fix formatting 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit e6f30c0ebe)
 2025-01-17 06:50:00 +00:00
maskers
15887c2d92 truncate logs for mclo.gs upload to fit 25k line limit 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 014fc14291)
 2025-01-17 06:50:00 +00:00
seth
b2c75dde95
Merge pull request #3302 from PrismLauncher/backport-3292-to-release-9.x 
[Backport release-9.x] Update Modrinth API authentication link
 2025-01-16 20:55:38 -05:00
Trial97
62ed3f8406 fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ee73916ca)
 2025-01-17 01:42:14 +00:00
Alexandru Ionut Tripon
5e227ceaae
Merge pull request #3281 from PrismLauncher/backport-3255-to-release-9.x 
[Backport release-9.x] propagate load component error
 2025-01-13 08:18:00 +02:00
Trial97
a739db8bdb propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6ebfcb91cf)
 2025-01-08 22:22:36 +00:00
Alexandru Ionut Tripon
fdfdf2eef1
Merge pull request #3224 from Trial97/backport_fix_auto_mod_provider 
[backport]Fix automatically choose mod provider option
 2024-12-19 10:34:01 +02:00
Trial97
bbfa5a5ed1
Fix automatically choose mod provider option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-19 09:23:51 +02:00
Alexandru Ionut Tripon
43dc330e55
Merge pull request #3223 from Trial97/backport_fix_flame_loader_match 
[backport]fix the flame loaders match
 2024-12-18 23:30:10 +02:00
Trial97
0c962dff59
fix the flame loaders match 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-18 22:53:18 +02:00
timoreo
ca0dd583ba
Merge pull request #3222 from PrismLauncher/backport-3197-to-release-9.x 
[Backport release-9.x] Do not fail curseforge import if modrinth file check fails
 2024-12-18 19:53:32 +01:00
Trial97
7bb686c85b Do not fail curseforge import if modrinth file check fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a1c1c0b769)
 2024-12-18 18:53:13 +00:00
timoreo
f8d3d8399d
Merge pull request #3221 from PrismLauncher/backport-3214-to-release-9.x 
[Backport release-9.x] Correct symbolic link destination on manifest (Mojang) Java download
 2024-12-18 19:42:58 +01:00
Kenneth Chew
9cb2a3ab2d Correct symbolic link destination on manifest Java download 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit 8d53242952)
 2024-12-18 18:42:39 +00:00
Alexandru Ionut Tripon
072c495ec6
Merge pull request #3206 from PrismLauncher/backport-3202-to-release-9.x 
[Backport release-9.x] [macOS] Update Sparkle to v2.6.4
 2024-12-14 18:39:04 +02:00
Kenneth Chew
335941fb46 Update Sparkle to v2.6.4 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit b6cd46ad27)
 2024-12-14 16:36:04 +00:00
Alexandru Ionut Tripon
ebeff36da5
Merge pull request #3205 from PrismLauncher/backport-3199-to-release-9.x 
[Backport release-9.x] Fix tab order in launcher settings
 2024-12-14 18:34:38 +02:00
Kenneth Chew
1d29f63bec Fix tab order in launcher settings 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3712ba648)
 2024-12-14 16:32:21 +00:00
Alexandru Ionut Tripon
87dc1bb6a6
Merge pull request #3204 from PrismLauncher/backport-3198-to-release-9.x 
[Backport release-9.x] [macOS] Add local network usage description
 2024-12-14 18:19:20 +02:00
Alexandru Ionut Tripon
a85720b8d6
Merge pull request #3203 from PrismLauncher/backport-3181-to-release-9.x 
[Backport release-9.x] fix crash with invalid mrpack format
 2024-12-14 18:19:09 +02:00
Kenneth Chew
4c28a94de1 Add local network usage description 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3e44554ab)
 2024-12-14 16:16:49 +00:00
Trial97
344ae87f25 fix crash with invalid mrpack format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1dd0728a58)
 2024-12-14 16:16:06 +00:00
Alexandru Ionut Tripon
577999bd35
Merge pull request #3183 from PrismLauncher/backport-3170-to-release-9.x 
[Backport release-9.x] [Linux] Don't use fallback icon search paths
 2024-12-09 09:15:53 +02:00
leia uwu
887db29f35 fix icon theme search paths 
using fallback search paths breaks qadwaitadecorations

Signed-off-by: leia uwu <leia@tutamail.com>
(cherry picked from commit 614574f15c)
 2024-12-09 07:14:38 +00:00
Alexandru Ionut Tripon
7865b8128e
Merge pull request #3169 from PrismLauncher/backport-3166-to-release-9.x 
[Backport release-9.x] chore(deps): update actions/cache action to v4.2.0
 2024-12-06 08:47:51 +02:00
renovate[bot]
a58f125535 chore(deps): update actions/cache action to v4.2.0 
(cherry picked from commit 94c893bd86)
 2024-12-06 06:47:20 +00:00
Alexandru Ionut Tripon
d1a05d312d
Merge pull request #3158 from PrismLauncher/backport-3119-to-release-9.x 
[Backport release-9.x] Sync Flatpak manifest with Flathub's
 2024-12-02 17:30:57 +02:00
guihkx
bbf21e5824 ci(flatpak): update build artifact name 
Just aligning the name of the Flatpak package with other build artifacts.

Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
(cherry picked from commit e0faee7f26)
 2024-12-02 15:30:33 +00:00
guihkx
73b4223b61 flatpak: update KDE runtime to 6.8 
This also switches to the Docker image provided and maintained by
Flathub collaborators through the 'flathub-infra' organization on
GitHub, because it looks better maintained at the moment.

Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
(cherry picked from commit f6770a847a)
 2024-12-02 15:30:33 +00:00
guihkx
686e0b7b18 flatpak: update xrandr to 1.5.3 
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
(cherry picked from commit 4a50e94967)
 2024-12-02 15:30:33 +00:00
Alexandru Ionut Tripon
189878e7e3
Merge pull request #3157 from PrismLauncher/backport-3135-to-release-9.x 
[Backport release-9.x] Make FTB Import note italic to match others
 2024-12-02 16:25:06 +02:00
Trial97
af74d5f410 Make FTB Import note italic to match others 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a09af619ce)
 2024-12-02 14:17:44 +00:00
Tayou
cdfd0b1002
Merge pull request #3156 from PrismLauncher/backport-3152-to-release-9.x 
[Backport release-9.x] Fix system icons on Linux
 2024-12-02 15:02:21 +01:00
leia uwu
9791c306dc fix: icon search paths memory leak 
Signed-off-by: leia uwu <leia@tutamail.com>
(cherry picked from commit 3f67ef968b)
 2024-12-02 14:00:59 +00:00
leia uwu
e7e9265c40 fix: fix system icons 
This sets the fallback icon theme to the current(system default) icon theme before
launcher specific themes are applied

And removes `Inherits` line of multimc/legacy icon theme because it can end up making it
inherit a default theme set from /usr/share/icons/default/index.theme
instead of the user configured theme (probably a qt bug?)

Signed-off-by: leia uwu <leia@tutamail.com>
(cherry picked from commit fd9c80db62)
 2024-12-02 14:00:59 +00:00
Alexandru Ionut Tripon
e0c323a190
Merge pull request #3138 from PrismLauncher/backport-3130-to-release-9.x 
[Backport release-9.x] Improve MANIFEST.MF parsing
 2024-11-25 12:09:01 +02:00
Kationor
a914747416 Improve MANIFEST.MF parsing 
Previously, we would only properly parse LF-encoded manifests, and even
those only if they used the recommended casing.

This commit allows the parser to recognise CR and CRLF newlines, and
also makes the name comparison case insensitive to align with the
specification. (Though not completely: we still don't support multiline
values)

Signed-off-by: Kationor <n96211028@gmail.com>
(cherry picked from commit b40a1973bf)
 2024-11-25 10:05:19 +00:00
Alexandru Ionut Tripon
d453240a94
Merge pull request #3105 from Trial97/backport_3019 
[Backport release-9.x] fixed double deletion for tasks
 2024-11-15 10:35:25 +02:00
Trial97
4c4017d7ca remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-15 09:35:36 +02:00
Alexandru Ionut Tripon
2a4c4ed8ea
Merge pull request #3103 from PrismLauncher/backport-3024-to-release-9.x 
[Backport release-9.x] fix leak on resource search
 2024-11-15 08:55:46 +02:00
Alexandru Ionut Tripon
947fbf7d64
Merge pull request #3102 from PrismLauncher/backport-3070-to-release-9.x 
[Backport release-9.x] Add scrollbar to Settings -> Launcher -> Features
 2024-11-15 08:55:17 +02:00