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

4480 Commits

Author SHA1 Message Date
Evan Goode
35131193dd Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:23:05 -04:00
Seth Flynn
f00226f797 fix(SystemTheme): use default palette on all system themes 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e5861129ad58a8b5cdf55ed69bb9a7ce92811b87)
 2025-04-06 19:55:13 +00:00
Sticks
b0ee4f6e58 fix: remove qWarning for unknown state 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit d4e1851e6779d99e3ffde79c7e4e8edb568415ce)
 2025-04-01 15:10:15 +00:00
Sticks
25ce20a877 fix: Grammar correction in failed message for update dialogues 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit ea5458ed2253a4e8a9ef50d076fe72c57d2cb669)
 2025-04-01 15:10:15 +00:00
sticks
2952b1d6b6 feat: add updater dialogues 
Signed-off-by: sticks <tanner@teamhydra.dev>
(cherry picked from commit 998bc660fa97f4527443dd826eede5e8eab23651)
 2025-04-01 15:10:15 +00:00
LAHarbottle
6de8ed91a3 Fix typo in NetRequest.cpp 
Signed-off-by: LAHarbottle <87842870+LAHarbottle@users.noreply.github.com>
(cherry picked from commit 66c6399adedcb52c2b7391cdbf38602f8b2814a6)
 2025-03-31 05:13:04 +00:00
Trial97
fcc1e80237 fix themes leak 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5b12d3cfff9092c0364e455c211fc189d87039cd)
 2025-03-29 23:55:27 +00:00
Evan Goode
3ced5d6546 Support authlib-injector skin upload 2025-03-25 16:16:40 -04:00
Evan Goode
43cd5853c1 clang-format 2025-03-24 21:57:40 -04:00
Evan Goode
9116d373e7 Create authlib-injector account with punycoded URL 
Related: https://github.com/yushijinhun/authlib-injector/issues/270
 2025-03-24 20:20:36 -04:00
TheKodeToad
d0a77df703 Try best to avoid regression 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 513959750f23719b55030cd34b9a8f5b248289c5)
 2025-03-24 17:23:35 +00:00
TheKodeToad
57120e0c9d Use correct colours for all system themes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f08478c7ece0cd4e13b0bc188d0dcb9ea04c3199)
 2025-03-24 17:23:35 +00:00
Evan Goode
0e943b4bb1 Add back AuthlibInjectorMetadataStep 
Apparently this was forgotten during the 9.0 merging.
 2025-03-24 13:15:00 -04:00
Alexandru Ionut Tripon
57981a070f
[Backport release-9.x] Fix crash with low disk space (#3538) 2025-03-24 19:04:38 +02:00
Trial97
9686a3c81c fix crash on accessing reseted output 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9ce5587f60d637d48bf20a8b9a40f020898710de)
 2025-03-24 17:03:13 +00:00
Trial97
b348114dee rename variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 269938dfd866df5918eb44779667142f7a157c22)
 2025-03-24 17:03:13 +00:00
Trial97
07604c9271 fix account help link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a4472406b96faabf2bdb78d152fc0e66bfe4ac63)
 2025-03-24 16:58:49 +00:00
Alexandru Ionut Tripon
b9d15a4781 Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 88bdb6541e3a57d6f84e75080dd6d24c1589a73d)
 2025-03-14 22:08:50 +00:00
Trial97
190d17acd3 Fix crash with invalid quilt mod info 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0626e354a026f9a2a35a4d6e28a0af105cb22986)
 2025-03-14 22:08:50 +00:00
Trial97
299cbf8009 fix mod load with empty gameversions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 29b3eb5cc6fe3ba48a28598222212966bade1444)
 2025-03-10 12:40:50 +00:00
Alexandru Ionut Tripon
70ca7af205
[Backport release-9.x] fix beginResetModel called before endResetModel (#3486) 2025-03-09 14:05:42 +02:00
Trial97
fc639c0902 fix beginResetModel called before endResetModel 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c441ae05df58eecf315c1379962a59d52c263f14)
 2025-03-09 12:05:09 +00:00
Trial97
2bb094a90b fix null mainwindow in case of login on setup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7db717ee7c503aef3f3b70bbc4becb8c20485897)
 2025-03-09 12:05:03 +00:00
Trial97
c206064976 rename some variables 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 162bbcfe19e67f23bf8d21142fdad253500a3b64)
 2025-03-09 12:05:03 +00:00
Evan Goode
15aff73aa1 Show CurseForge in new instance dialog even if no API key 2025-03-08 13:04:43 -05:00
TheKodeToad
70db5a2f92 Default to Fusion based Dark/Bright themes on Windows 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 5261b615d72eb0adbeb9c53e30b73448d722cf11)
 2025-03-02 06:49:59 +00:00
thonkdifferent
d75b23c092 Recognize riscv64 as a 64-bit platform 
Currently PrismLauncher complains about the installed JDK being a 32-bit version, despite it being compiled for 64-bit RISC-V `riscv64`.

This PR fixes this issue.

Signed-off-by: thonkdifferent <41342923+thonkdifferent@users.noreply.github.com>
(cherry picked from commit 8f1750df51668a94ab750dd05345ec5cc4e124c2)
 2025-02-17 18:33:29 +00:00
Trial97
97180324ee
make sure if user changes java path also disable java management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-17 16:14:15 +02:00
Evan Goode
61892f857f Use api.feed-the-beast.com, not modpacks.ch 2025-02-15 19:45:07 -05:00
Rachel Powers
ec7aaaadf3
[Backport release-9.x] add libMangoHud_shim.so to mangohub preloadlist (#3418) 2025-02-13 14:42:35 -07:00
Trial97
1ab6ce42b5 add libMangoHud_shim.so to mangohub preloadlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9e954548dd702c05fbf33474c9c86f52fb67d4b4)
 2025-02-13 21:41:14 +00:00
Trial97
05bf9c3689 make sure if user changes java path also disable java management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 174cddcf42f26b24a5a74ce2eaf4923b5b269d47)
 2025-02-13 21:40:54 +00:00
Alexandru Ionut Tripon
9456140155 Update launcher/ui/widgets/CheckComboBox.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 22b59e760c0f39749916052b9323e55f4217dd72)
 2025-02-11 19:10:21 +00:00
Alexandru Ionut Tripon
159771f283 Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1d1a4f1b30837e13ebd99c016af171d79697f22f)
 2025-02-11 19:10:21 +00:00
Trial97
9616d898d4 Fix some undefined behaviour 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bf1084d7fa6503b65bdb63374e5f92020ae4a3d1)
 2025-02-11 19:10:21 +00:00
Alexandru Ionut Tripon
a37cac6f9b
Fixed when game crashes, it doesn't log any time played (#3392) 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-06 09:41:19 +02:00
Trial97
c7831fd697 fix add resource with no instance 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c5efe081b4ff9ec81b882e6deabcbfc5be269329)
 2025-01-31 21:04:07 +00:00
Trial97
ae3e1a262e ensure that the snapshot mapping is on all apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8e5a7c6e333969b5412efd1349f9430ced5654c8)
 2025-01-31 21:03:11 +00:00
Trial97
f8dc58665b map modrinth snapshots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1d8bf1d5a788e689d26e0afa8f5cfca0e3859e5d)
 2025-01-31 21:03:11 +00:00
Trial97
855e49bda0 fix curseforge with empty loader as newest version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e4ad4051c8b87bd5102a76a860408de2b447d74d)
 2025-01-21 21:44:27 +00:00
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