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

4415 Commits

Author SHA1 Message Date
Evan Goode
594fa981ea Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-11 19:05:25 -05: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
Evan Goode
8f44b6513f Add dialog to select profile if multiple availableProfiles 
Resolves https://github.com/unmojang/FjordLauncher/issues/29 and
obsoletes https://github.com/unmojang/FjordLauncher/pull/34.

This implementation follows the authlib-injector specification:
https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E8%B4%A6%E6%88%B7%E7%9A%84%E6%B7%BB%E5%8A%A0
([Google translate to English](https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US))
 2024-11-25 17:42:38 -05: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
Evan Goode
e2de54b6b3 Add Spaceship and Phoebe catpack 2024-11-23 16:32:40 -05: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
Evan Goode
0f33e12922 Remove extra search bars in FtbAppImport and Modrinth pages 2024-10-28 22:12:48 -04:00
Evan Goode
04703d83ee Delete remaining Mojang cruft 2024-10-28 22:07:15 -04: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
Trial97
1e696328bb fix #3001 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b593ff09e9c4b5fa30ca082eea4cd69f12a286e5)
 2024-10-28 20:59:25 +00:00
Trial97
1d9c97803a rename snake_case to camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44894a29b1784cfa8a04807c17d21169230ff922)
 2024-10-28 20:59:25 +00:00
Trial97
3d55236fdf add extra protection against empty download link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8daa1219a508ddb37070c01046c78b731a277887)
 2024-10-28 20:59:25 +00:00
Trial97
130714a9ab translate standard buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bd82737efbb99dfc488d6d073046e5fe62693a9e)
 2024-10-28 20:34:51 +00:00
Trial97
98fe035442 replace unzipping with unpacking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9eb1ce3ad7dde0b2ca551b0b281081724e6fd58e)
 2024-10-28 13:23:42 +00:00
Trial97
8e4994590b fix unzipping typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 685d3c79ac78d7e41ab257de82dc743020189a33)
 2024-10-28 13:23:42 +00:00
Trial97
9560447c92 swap search with filter button for modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 61448a61ea400eebd91f97aa07e9419cc2f35823)
 2024-10-28 13:04:39 +00:00
Trial97
42a6bd1151 change ZekeZ name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c4cd7cf6c173b7052f31614b4641d2172defa91a)
 2024-10-27 19:31:56 +00:00
Trial97
f06505b138 change contributors name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f373a5cea0e816158cdabca3423107989aed0a85)
 2024-10-27 19:31:56 +00:00
Evan Goode
5c8bdf99cd Gray out "Manage Skins" button for authlib-injector accounts 
Support for this is blocked by
https://github.com/unmojang/FjordLauncher/issues/37, which we can get to
after the 9.0 release.
 2024-10-27 13:19:38 -04:00
Evan Goode
fab399c094 Remove extra code comment 2024-10-26 19:36:26 -04:00
Evan Goode
e177117a8f Fix FTB import goof 2024-10-26 19:08:36 -04:00
Evan Goode
9a0f9a9f67 Fix Windows build 2024-10-26 18:30:16 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00