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

8790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Seth Flynn
dd90049b30 ci: use generic workflow for publishing 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 61d7f088838e25ddb0a7089a6fa3f7d232331c24)
 2025-01-30 16:31:27 +00:00
Alexandru Ionut Tripon
18170cc900
Merge pull request #3364 from PrismLauncher/backport-3314-to-release-9.x 
[Backport release-9.x] update submodules
 2025-01-29 23:41:13 +02:00
Trial97
71eced3e61 update submodules 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dc00c47f2e2b79705c32f438298d968aaa4fdf26)
 2025-01-29 21:40:21 +00:00
Alexandru Ionut Tripon
cb49b27513
Merge pull request #3363 from PrismLauncher/backport-3362-to-release-9.x 
[Backport release-9.x] ci: use flakehub cache
 2025-01-29 23:34:39 +02:00
Seth Flynn
7b502fe8c9 ci: run nix workflow on pull_request_target 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 169f5728b1019582db150f3b1618515eb1438517)
 2025-01-29 21:34:15 +00:00
Seth Flynn
55578bf949 ci: use flakehub cache 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 8816be166821d5ce1a4cd8edfbe7b91727b6eb34)
 2025-01-29 21:34:15 +00:00
Alexandru Ionut Tripon
ee33bf50c2
Merge pull request #3361 from getchoo-contrib/backport-3360-to-release-9.x 
[Backport release-9.x] Split Flatpak and Nix CI jobs from main build workflow
 2025-01-29 23:12:18 +02:00
Seth Flynn
702db71f61
ci: separate flatpak job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 49d734f3142328a71506b28c8c1cdcb99788c34d)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:06:27 -05:00
Seth Flynn
8e8efc304f
ci: separate nix job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 417688089d756da23ca3f482a32871963d289211)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:06:27 -05:00
Alexandru Ionut Tripon
2b204c8169
Merge pull request #3333 from PrismLauncher/backport-3330-to-release-9.x 
[Backport release-9.x] Use better compile flags for MINGW
 2025-01-29 22:52:29 +02:00
Alexandru Ionut Tripon
ed2eddc258
Merge pull request #3335 from PrismLauncher/backport-3294-to-release-9.x 
[Backport release-9.x] Fix updating Curseforge mods with missing mod loader
 2025-01-21 23:45:40 +02: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
Seth Flynn
bbde47842b feat: use better compile flags for mingw 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e66f447ce5bca996b0a12fac02216b2b6ab8ccb6)
 2025-01-21 13:18:57 +00:00
Alexandru Ionut Tripon
0508bbd05f
Merge pull request #3331 from getchoo-contrib/backport-ubuntu-22.04 
[Backport release-9.x] Use Ubuntu 22.04 for Linux builds
 2025-01-21 09:08:46 +02:00
Alexandru Ionut Tripon
808978080e
Merge pull request #3329 from getchoo-contrib/backport-qt-6.8 
[Backport release-9.x] chore: update to qt 6.8.x
 2025-01-21 09:07:58 +02:00
Alexandru Ionut Tripon
ea0d710aaf
Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:47:00 -05:00
Alexandru Ionut Tripon
02e1988779
Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00
Trial97
fdab044c04
remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00
Trial97
e77ac36c3f
fix appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00