ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,746 Commits 4 Branches 5 Tags 40 MiB
0508bbd05f
Commit Graph

4092 Commits

Author SHA1 Message Date
Trial97
beac093d62 Added mouse interactions for labels in ProgressDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 08f5148a9a4e574dd3ef4e7dc1e46a05ffd9dd5e)
 2025-01-17 19:00:06 +00:00
Alexandru Ionut Tripon
8c6602147b
Merge pull request #3308 from PrismLauncher/backport-3254-to-release-9.x 
[Backport release-9.x] remove EditAccountDialog
 2025-01-17 09:02:31 +02:00
Alexandru Ionut Tripon
9d8c3f251f
Merge pull request #3307 from PrismLauncher/backport-2737-to-release-9.x 
[Backport release-9.x] Truncate logs for mclo.gs to fit 25k line limit
 2025-01-17 09:02:01 +02:00
Alexandru Ionut Tripon
c787e65ed4
Merge pull request #3306 from PrismLauncher/backport-1555-to-release-9.x 
[Backport release-9.x] Correctly expand environment variables for pre/post launch and wrapper commands
 2025-01-17 09:01:21 +02:00
Trial97
820b9e3fd0 remove EditAccountDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e01df73debc8cb578e3e1b1e557388a8d0a7a052)
 2025-01-17 06:56:28 +00:00
maskers
c8c3370d36 fix off by one error 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 6a12c43c787db4a64748d6c3d03b34981948d7ce)
 2025-01-17 06:50:00 +00:00
TheKodeToad
cffa9a2da0 Confirm Truncate -> Truncation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 43fc9ba932ec65d274b60bafb4d3c3f1d5bf55f0)
 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 762d24bd02ae6a0c0f241626c9c06deeaae86574)
 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 a910337e9d148937fc6a7339a7bcdd9a2db1ec03)
 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 6d017b5f0b9fd878d387bf33585221ea079e305b)
 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 65f852615247f6c1ba3cd81cf9e51ebc0220341b)
 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 99bd4a89373416cea641f1421d1082ff823eba2e)
 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 cf914526bf5330600f3cadb9f4baddb5144af21f)
 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 858f6aa9b8adcb5d2ac9eadd2702a21a88f9e4c4)
 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 e6f30c0ebe0ddd43b493f27156d6c0765105ded5)
 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 014fc142915ec4a0f96b3082f76d4d32ce7596aa)
 2025-01-17 06:50:00 +00:00
Trial97
b7b5630588 expand env from wrapped cmd 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 09a118e85e3646ded9d7b2704d2f95a589ca19b9)
 2025-01-17 06:47:08 +00:00
Trial97
43834e2148 correctly expand env vars 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c12beb43a0f3dad6e66fd42192dbbf1f78fb6c53)
 2025-01-17 06:47:08 +00:00
sshcrack
feb275a580
load meta first 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit cf2dcbd431b0c4bb03ff527465f972d72f713b0c)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-16 21:46:13 -05:00
sshcrack
759db0c90f
change order of steps 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit dedb7a2343f7d433492dee5930802ed47294b722)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-16 21:03:52 -05:00
Trial97
62ed3f8406 fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ee73916ca31666abc48f45e8b0bfcf8d678e6cf)
 2025-01-17 01:42:14 +00:00
Trial97
a739db8bdb propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6ebfcb91cf954048061ff39719629e7f581f1997)
 2025-01-08 22:22:36 +00: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
Trial97
0c962dff59
fix the flame loaders match 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-18 22:53:18 +02: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 a1c1c0b769d77eb8c44cef3dc0966e7184b2ce78)
 2024-12-18 18:53:13 +00: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 8d53242952ceeed11bd1a57c9ac43344d854ac8c)
 2024-12-18 18:42:39 +00: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 c3712ba6483f6386e2930ec0ed059d8c94f671b6)
 2024-12-14 16:32:21 +00:00
Trial97
344ae87f25 fix crash with invalid mrpack format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1dd0728a58159bc835b2e7724a707776ae0b93ce)
 2024-12-14 16:16:06 +00: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 614574f15c507f884fc2ceff74db8c919674a0f1)
 2024-12-09 07:14:38 +00:00
Trial97
af74d5f410 Make FTB Import note italic to match others 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a09af619cee3265710097724f539d9457695658d)
 2024-12-02 14:17:44 +00:00
leia uwu
9791c306dc fix: icon search paths memory leak 
Signed-off-by: leia uwu <leia@tutamail.com>
(cherry picked from commit 3f67ef968bb9be3b1cdfdfa68e2d38ddf8e1a3cf)
 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 fd9c80db62436b1a364cb8342ba45a059c53f899)
 2024-12-02 14:00:59 +00: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 b40a1973bfe590fb21b486419a8d223b2c6aae7f)
 2024-11-25 10:05:19 +00: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
Trial97
1c94a3e3e5 fix leak on resource search 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8e7d84d05beffac492522f4b2c0d9e638b15146b)
 2024-11-15 05:48:32 +00:00
TheKodeToad
eefeb5799d Add scrollbar to Settings -> Launcher -> Features 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 71e55f88294976577ad0b2f8c21b635cf8fc9735)
 2024-11-15 05:40:31 +00:00
timoreo
6c6a4625ab
Merge pull request #3101 from PrismLauncher/backport-3096-to-release-9.x 
[Backport release-9.x] Fix file remaingin open after program closure
 2024-11-15 06:15:22 +01:00
Trial97
ea9029d7b6 Fix file remaingin open after program closure 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit ce61ed2f86d313f63c999d012d768425ea3793c3)
 2024-11-15 05:14:42 +00:00
Trial97
76602391f4 Fix crash caused by invalid resource pointer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-14 16:26:21 +02:00
Trial97
984daa450b Close the window using the invokeMethod to not block 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9601fbf2d5b36d3609cce6b1a3b458db0d170531)
 2024-11-07 21:48:30 +00:00
Trial97
1dce1360bd Fix installed typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 670c932f32753fd67979f95810b052d7a62a0006)
 2024-11-07 16:31:03 +00:00
Trial97
40af3cf3d2 use isPortable to determine if the MSAStep should check for url handler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1)
 2024-11-03 09:56:08 +00:00
Trial97
484d90899f disable retry for modrinth currentVersions API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6f2f3c2d3bf6a170060523ad47fe69fef57bd9b4)
 2024-11-03 09:55:50 +00:00
Trial97
d21cda1880 lock m_instanceExtras 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 11d4d948aa1a1ba67cee59193eb98a7fdad2d909)
 2024-10-30 20:56:30 +00:00
Trial97
dd8dec8be8 fix macos system detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 14c95b9d376975144faddc33e7154cca86621804)
 2024-10-30 19:16:53 +00:00
Ben Westover
d105d76f2a Fix some typos 
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e)
 2024-10-29 22:06:15 +00:00
Trial97
63a6f823fd add qassert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 94f65f8727bfd12cc50eb8b62d52bca308cef9b5)
 2024-10-28 20:59:25 +00:00
Trial97
db32b2ad99 remove message box 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cdda4377b0090a035e286a86fd78f126f995356)
 2024-10-28 20:59:25 +00:00
Trial97
c3cf5d31da replace currentData with itemData on QComboBox::currentIndexChanged slots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0cafac84ac6328fefb8992de2c6a2385b1c0053c)
 2024-10-28 20:59:25 +00:00