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

9434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
maskers
0cb5ac7a06 add a warning about the log being too large 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit cf914526bf5330600f3cadb9f4baddb5144af21f)
 2025-01-17 06:50:00 +00:00
maskers
db35f47105 fix formatting 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 858f6aa9b8adcb5d2ac9eadd2702a21a88f9e4c4)
 2025-01-17 06:50:00 +00:00
maskers
cf8a82e78a fix formatting 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit e6f30c0ebe0ddd43b493f27156d6c0765105ded5)
 2025-01-17 06:50:00 +00:00
maskers
15887c2d92 truncate logs for mclo.gs upload to fit 25k line limit 
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
(cherry picked from commit 014fc142915ec4a0f96b3082f76d4d32ce7596aa)
 2025-01-17 06:50:00 +00:00
Trial97
b7b5630588 expand env from wrapped cmd 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 09a118e85e3646ded9d7b2704d2f95a589ca19b9)
 2025-01-17 06:47:08 +00:00
Trial97
43834e2148 correctly expand env vars 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c12beb43a0f3dad6e66fd42192dbbf1f78fb6c53)
 2025-01-17 06:47:08 +00:00
sshcrack
feb275a580
load meta first 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit cf2dcbd431b0c4bb03ff527465f972d72f713b0c)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-16 21:46:13 -05:00
sshcrack
759db0c90f
change order of steps 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
(cherry picked from commit dedb7a2343f7d433492dee5930802ed47294b722)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-16 21:03:52 -05:00
seth
b2c75dde95
Merge pull request #3302 from PrismLauncher/backport-3292-to-release-9.x 
[Backport release-9.x] Update Modrinth API authentication link
 2025-01-16 20:55:38 -05:00
Trial97
62ed3f8406 fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ee73916ca31666abc48f45e8b0bfcf8d678e6cf)
 2025-01-17 01:42:14 +00:00
Evan Goode
bf48b45ff1 Bump to 9.2.1 2025-01-13 12:23:55 -05:00
Evan Goode
d931e8fa49
Merge pull request #51 from unmojang/evan-goode/fix-selectedProfile 
Only send `selectedProfile` when selecting a profile
 2025-01-13 11:52:09 -05:00
Evan Goode
a108c8678e Remove irrelevant FIXME comment 2025-01-13 11:51:33 -05:00
Alexandru Ionut Tripon
5e227ceaae
Merge pull request #3281 from PrismLauncher/backport-3255-to-release-9.x 
[Backport release-9.x] propagate load component error
 2025-01-13 08:18:00 +02:00
Evan Goode
a5fcdd03bf Only send selectedProfile when selecting a profile 
Some authentication servers (Blessing Skin) care when selectedProfile is
sent on POST /refresh but the clientToken is already bound to a profile.
We should only include selectedProfile in POST /refresh during the
initial "Add authlib-injector account" process when selecting a profile
from multiple availableProfiles.

For https://github.com/unmojang/FjordLauncher/issues/50
 2025-01-12 22:54:25 -05:00
Evan Goode
d2d6320e44
README: Don't mention fjordlauncher-bin MPR package 
prismlauncher-bin [1] is out of date and so fjordlauncher-bin also hasn't been updated in a while. Not sure whether -bin packages are dangerous on MPR as they are on AUR, so we'll just omit it from the install instructions for now.

[1] https://mpr.makedeb.org/packages/prismlauncher-bin
 2025-01-12 04:02:16 +00:00
Evan Goode
8cd807c2d6 Fix FetchFlameAPIKey compile error 2025-01-11 19:37:53 -05:00
Evan Goode
ccc886b51f Re-enable built-in updater 2025-01-11 19:19:36 -05:00