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

8809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandru Ionut Tripon
f9ab98f2cf
[Backport release-9.x] fix themes leak (#3556) 2025-03-30 01:55:52 +02: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
Alexandru Ionut Tripon
1a56396e2e
[Backport release-9.x] Pin AppImage tooling in CI, drop libfuse2 (#3551) 2025-03-27 09:51:49 +02:00
Seth Flynn
0f21e01b46
ci: don't install libfuse2 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 671aad88f52e3fbba872e80f2805c0c5c64b7a8d)
 2025-03-26 21:15:39 -04:00
Seth Flynn
88109eaa71
ci: pin appimage tooling 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 5d5155bb22f9935e17e33008a644736404629928)
 2025-03-26 21:15:39 -04:00
Seth Flynn
1425c9801e
ci: use bundled linuxdeploy appimage plugin 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 6ef59fe984777e2620b445a78493afb86074eb8b)
 2025-03-26 21:15:39 -04:00
Alexandru Ionut Tripon
1a06e34fe4
[Backport release-9.x] Use correct colours for all system themes (#3539) 2025-03-24 19:25:27 +02: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
Alexandru Ionut Tripon
57981a070f
[Backport release-9.x] Fix crash with low disk space (#3538) 2025-03-24 19:04:38 +02:00
Alexandru Ionut Tripon
be1a1baba4
[Backport release-9.x] fix account help link (#3537) 2025-03-24 19:04:25 +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
b49e9763bf
[Backport release-9.x] Fix crash with invalid quilt mod info (#3506) 2025-03-15 00:12:19 +02: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
Alexandru Ionut Tripon
5de91076ea
[Backport release-9.x] fix mod load with empty gameversions (#3490) 2025-03-10 14:41:07 +02: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
Alexandru Ionut Tripon
19aaaa9988
[Backport release-9.x] fix null mainwindow in case of login on setup (#3485) 2025-03-09 14:05:35 +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
Alexandru Ionut Tripon
d8f51e900a
[Backport release-9.x] chore: Update year range (#3462) 2025-03-03 08:27:33 +02:00
txtsd
b85e53eaf9 chore: Update year range 
Signed-off-by: txtsd <code@ihavea.quest>
(cherry picked from commit f99b7e9ebd17129448aabd630c87e8a15fb2734c)
 2025-03-03 06:27:10 +00:00
Alexandru Ionut Tripon
0073d82863
[Backport release-9.x] Default to Fusion based Dark/Bright themes on Windows (#3457) 2025-03-02 08:52:23 +02: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
Alexandru Ionut Tripon
07010f226e
[Backport release-9.x] Recognize riscv64 as a 64-bit platform (#3428) 2025-02-17 20:35:08 +02: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
Alexandru Ionut Tripon
748b92571c
[Backport release-9.x] make sure if user changes java path also disable java management (#3426) 2025-02-17 20:32:54 +02: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
Rachel Powers
ec7aaaadf3
[Backport release-9.x] add libMangoHud_shim.so to mangohub preloadlist (#3418) 2025-02-13 14:42:35 -07:00
Rachel Powers
7d786987ad
[Backport release-9.x] make sure if user changes java path also disable java management (#3417) 2025-02-13 14:42:26 -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
f760f08df6
[Backport release-9.x] Fix some undefined behaviour (#3408) 2025-02-11 21:11:17 +02: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
e2526c80c8
Fixed when game crashes, it doesn't log any time played (#3392) (#3395) 2025-02-06 09:41:41 +02: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
Alexandru Ionut Tripon
2f889429da
Merge pull request #3376 from PrismLauncher/backport-3373-to-release-9.x 
[Backport release-9.x] Show warning when adding new resources with no instances
 2025-01-31 23:04:21 +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
Alexandru Ionut Tripon
b4c3123957
Merge pull request #3375 from PrismLauncher/backport-3260-to-release-9.x 
[Backport release-9.x] Map Minecraft snapshots to Modrinth
 2025-01-31 23:03:25 +02: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
Alexandru Ionut Tripon
19247bad14
Merge pull request #3367 from PrismLauncher/backport-3359-to-release-9.x 
[Backport release-9.x] Publish on FlakeHub
 2025-01-30 18:31:44 +02:00
Seth Flynn
4371933a84 feat: publish on flakehub 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 86cc6d3c5ee7157d5f9978580e94b94360a119f1)
 2025-01-30 16:31:27 +00:00