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 |
|
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 |
|
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 |
|
Trial97
|
a739db8bdb
|
propagate load component error
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6ebfcb91cf954048061ff39719629e7f581f1997)
|
2025-01-08 22:22:36 +00:00 |
|
Alexandru Ionut Tripon
|
fdfdf2eef1
|
Merge pull request #3224 from Trial97/backport_fix_auto_mod_provider
[backport]Fix automatically choose mod provider option
|
2024-12-19 10:34:01 +02:00 |
|
Trial97
|
bbfa5a5ed1
|
Fix automatically choose mod provider option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-12-19 09:23:51 +02:00 |
|
Alexandru Ionut Tripon
|
43dc330e55
|
Merge pull request #3223 from Trial97/backport_fix_flame_loader_match
[backport]fix the flame loaders match
|
2024-12-18 23:30:10 +02:00 |
|
Trial97
|
0c962dff59
|
fix the flame loaders match
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-12-18 22:53:18 +02:00 |
|
timoreo
|
ca0dd583ba
|
Merge pull request #3222 from PrismLauncher/backport-3197-to-release-9.x
[Backport release-9.x] Do not fail curseforge import if modrinth file check fails
|
2024-12-18 19:53:32 +01:00 |
|
Trial97
|
7bb686c85b
|
Do not fail curseforge import if modrinth file check fails
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a1c1c0b769d77eb8c44cef3dc0966e7184b2ce78)
|
2024-12-18 18:53:13 +00:00 |
|
timoreo
|
f8d3d8399d
|
Merge pull request #3221 from PrismLauncher/backport-3214-to-release-9.x
[Backport release-9.x] Correct symbolic link destination on manifest (Mojang) Java download
|
2024-12-18 19:42:58 +01:00 |
|
Kenneth Chew
|
9cb2a3ab2d
|
Correct symbolic link destination on manifest Java download
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit 8d53242952ceeed11bd1a57c9ac43344d854ac8c)
|
2024-12-18 18:42:39 +00:00 |
|
Alexandru Ionut Tripon
|
072c495ec6
|
Merge pull request #3206 from PrismLauncher/backport-3202-to-release-9.x
[Backport release-9.x] [macOS] Update Sparkle to v2.6.4
|
2024-12-14 18:39:04 +02:00 |
|
Kenneth Chew
|
335941fb46
|
Update Sparkle to v2.6.4
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit b6cd46ad27e8046962dcb7b3b43a973ff08564eb)
|
2024-12-14 16:36:04 +00:00 |
|
Alexandru Ionut Tripon
|
ebeff36da5
|
Merge pull request #3205 from PrismLauncher/backport-3199-to-release-9.x
[Backport release-9.x] Fix tab order in launcher settings
|
2024-12-14 18:34:38 +02:00 |
|
Kenneth Chew
|
1d29f63bec
|
Fix tab order in launcher settings
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3712ba6483f6386e2930ec0ed059d8c94f671b6)
|
2024-12-14 16:32:21 +00:00 |
|
Alexandru Ionut Tripon
|
87dc1bb6a6
|
Merge pull request #3204 from PrismLauncher/backport-3198-to-release-9.x
[Backport release-9.x] [macOS] Add local network usage description
|
2024-12-14 18:19:20 +02:00 |
|
Alexandru Ionut Tripon
|
a85720b8d6
|
Merge pull request #3203 from PrismLauncher/backport-3181-to-release-9.x
[Backport release-9.x] fix crash with invalid mrpack format
|
2024-12-14 18:19:09 +02:00 |
|
Kenneth Chew
|
4c28a94de1
|
Add local network usage description
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3e44554abccfd16ff7f84740932848e59d28474)
|
2024-12-14 16:16:49 +00:00 |
|
Trial97
|
344ae87f25
|
fix crash with invalid mrpack format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1dd0728a58159bc835b2e7724a707776ae0b93ce)
|
2024-12-14 16:16:06 +00:00 |
|