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 |
|
Edgars Cirulis
|
0d06fae7ae
|
chore: update Qt to 6.8.1
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit eb8c375ec5023bbc7c02e45d63da866058e56b26)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
|
2025-01-20 19:09:02 -05:00 |
|
Edgars Cirulis
|
a0c4cc59ac
|
ci: uprev qt install action to v4
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit 0beaa94311a00cdc02ef5ff7d182849fce419aa9)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
|
2025-01-20 19:09:02 -05:00 |
|
Edgars Cirulis
|
bd7371dbf1
|
ci: fix qt-6.8 workflow
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit b39098dbc5b371e31ce585f7534ffdb00096c2b5)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
|
2025-01-20 19:09:02 -05:00 |
|
Edgars Cirulis
|
d7756d29dc
|
chore: update Qt to 6.8.0
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit 5b6d551650e4590567321647ce68ae2043a8180c)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
|
2025-01-20 19:09:01 -05:00 |
|
Alexandru Ionut Tripon
|
0a7325ac12
|
Merge pull request #3324 from getchoo-contrib/backport-arm-stuff
[Backport release-9.x] Build Nix packages and Flatpaks for ARM
|
2025-01-20 09:21:29 +02:00 |
|
seth
|
ed2b5d4b0e
|
ci: build flatpaks for arm
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 66f0397087d9b88c93e69c5e26a138d235344546)
Signed-off-by: seth <getchoo@tuta.io>
|
2025-01-19 19:47:44 -05:00 |
|
seth
|
9f199a470c
|
ci: build nix packages for aarch64-linux
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 8e8538b506b5f3ae2b2424599078966600bb764c)
Signed-off-by: seth <getchoo@tuta.io>
|
2025-01-19 19:47:39 -05:00 |
|
Alexandru Ionut Tripon
|
1a98ef8bb7
|
Merge pull request #3309 from Trial97/bump9.3
bump to 9.3
|
2025-01-18 13:47:11 +02:00 |
|
Alexandru Ionut Tripon
|
d25d0d7ee6
|
Merge pull request #3312 from PrismLauncher/backport-1689-to-release-9.x
[Backport release-9.x] Added mouse interactions for labels in ProgressDialog
|
2025-01-17 21:10:03 +02: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 |
|
Trial97
|
81318d4953
|
bump to 9.3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2025-01-17 09:17:49 +02: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 |
|
Alexandru Ionut Tripon
|
ae84a78470
|
Merge pull request #3303 from getchoo-contrib/backport-3179-to-release-9.x
[Backport release-9.x] Fix $INST_JAVA not being set for auto download java
|
2025-01-17 08:56:39 +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 |
|