Trial97
|
76602391f4
|
Fix crash caused by invalid resource pointer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-11-14 16:26:21 +02:00 |
|
Alexandru Ionut Tripon
|
509f8c7307
|
Merge pull request #3079 from PrismLauncher/backport-3074-to-release-9.x
[Backport release-9.x] Close the window using the invokeMethod to not block
|
2024-11-07 23:48:40 +02:00 |
|
Trial97
|
984daa450b
|
Close the window using the invokeMethod to not block
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9601fbf2d5b36d3609cce6b1a3b458db0d170531)
|
2024-11-07 21:48:30 +00:00 |
|
Tayou
|
04e1a97d59
|
Merge pull request #3077 from PrismLauncher/backport-3036-to-release-9.x
[Backport release-9.x] Fix installed typo
|
2024-11-07 17:31:15 +01:00 |
|
Trial97
|
1dce1360bd
|
Fix installed typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 670c932f32753fd67979f95810b052d7a62a0006)
|
2024-11-07 16:31:03 +00:00 |
|
timoreo
|
87d5b96760
|
Merge pull request #3061 from PrismLauncher/backport-3060-to-release-9.x
[Backport release-9.x] ci: bump linux qt version
|
2024-11-05 11:26:18 +01:00 |
|
Rachel Powers
|
7f074ca7b9
|
ci: libxcb-curcsor_dev ?
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit ba6743d134589294ac3ba754e6ad83c2e59d4ffd)
|
2024-11-05 10:25:53 +00:00 |
|
Rachel Powers
|
c0394c52b7
|
ci: bump linux qt version
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit d63a3364111a99337c2096c807550f3d7c62b47a)
|
2024-11-05 10:25:53 +00:00 |
|
Alexandru Ionut Tripon
|
53bc20f13f
|
Merge pull request #3052 from PrismLauncher/backport-3042-to-release-9.x
[Backport release-9.x] use isPortable to determine if the MSAStep should check for url handler
|
2024-11-03 11:56:20 +02:00 |
|
Trial97
|
40af3cf3d2
|
use isPortable to determine if the MSAStep should check for url handler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1)
|
2024-11-03 09:56:08 +00:00 |
|
Alexandru Ionut Tripon
|
3977918c5b
|
Merge pull request #3051 from PrismLauncher/backport-3045-to-release-9.x
[Backport release-9.x] disable retry for modrinth currentVersions API
|
2024-11-03 11:56:07 +02:00 |
|
Trial97
|
484d90899f
|
disable retry for modrinth currentVersions API
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6f2f3c2d3bf6a170060523ad47fe69fef57bd9b4)
|
2024-11-03 09:55:50 +00:00 |
|
Tayou
|
0f5eb03839
|
Merge pull request #3034 from PrismLauncher/backport-3010-to-release-9.x
|
2024-10-30 21:57:18 +01:00 |
|
Trial97
|
d21cda1880
|
lock m_instanceExtras
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 11d4d948aa1a1ba67cee59193eb98a7fdad2d909)
|
2024-10-30 20:56:30 +00:00 |
|
Alexandru Ionut Tripon
|
52a321b93b
|
Merge pull request #3033 from PrismLauncher/backport-3030-to-release-9.x
[Backport release-9.x] Fix system detection for Intel Macs
|
2024-10-30 21:21:49 +02:00 |
|
Trial97
|
dd8dec8be8
|
fix macos system detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 14c95b9d376975144faddc33e7154cca86621804)
|
2024-10-30 19:16:53 +00:00 |
|
Evan Goode
|
390af2df45
|
Add back "PollyMC Contributors", it was deleted by mistake
|
2024-10-29 21:30:07 -04:00 |
|
Evan Goode
|
4e154d2b47
|
Merge pull request #38 from unmojang/evan-goode/merge-9.0
Merge changes from Prism Launcher 9.1
|
2024-10-29 20:54:09 -04:00 |
|
Tayou
|
23d6f8aaed
|
Merge pull request #3028 from PrismLauncher/backport-3027-to-release-9.x
|
2024-10-29 23:15:22 +01:00 |
|
Ben Westover
|
d105d76f2a
|
Fix some typos
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e)
|
2024-10-29 22:06:15 +00:00 |
|
Ben Westover
|
698a838b56
|
Shorten metainfo.xml app summary
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit fd109c47401c755e35da9c2884e9b38532bed56c)
|
2024-10-29 22:06:15 +00:00 |
|
Evan Goode
|
0f33e12922
|
Remove extra search bars in FtbAppImport and Modrinth pages
|
2024-10-28 22:12:48 -04:00 |
|
Evan Goode
|
04703d83ee
|
Delete remaining Mojang cruft
|
2024-10-28 22:07:15 -04:00 |
|
Alexandru Ionut Tripon
|
1129b4160c
|
Merge pull request #3022 from PrismLauncher/backport-2989-to-release-9.x
[Backport release-9.x] add extra protection against empty download link
|
2024-10-28 23:00:19 +02:00 |
|
Trial97
|
63a6f823fd
|
add qassert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 94f65f8727bfd12cc50eb8b62d52bca308cef9b5)
|
2024-10-28 20:59:25 +00:00 |
|
Trial97
|
db32b2ad99
|
remove message box
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cdda4377b0090a035e286a86fd78f126f995356)
|
2024-10-28 20:59:25 +00:00 |
|
Trial97
|
c3cf5d31da
|
replace currentData with itemData on QComboBox::currentIndexChanged slots
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0cafac84ac6328fefb8992de2c6a2385b1c0053c)
|
2024-10-28 20:59:25 +00:00 |
|
Trial97
|
1e696328bb
|
fix #3001
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b593ff09e9c4b5fa30ca082eea4cd69f12a286e5)
|
2024-10-28 20:59:25 +00:00 |
|
Trial97
|
1d9c97803a
|
rename snake_case to camelCase
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44894a29b1784cfa8a04807c17d21169230ff922)
|
2024-10-28 20:59:25 +00:00 |
|
Trial97
|
3d55236fdf
|
add extra protection against empty download link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8daa1219a508ddb37070c01046c78b731a277887)
|
2024-10-28 20:59:25 +00:00 |
|
Alexandru Ionut Tripon
|
42190819ae
|
Merge pull request #3020 from PrismLauncher/backport-2837-to-release-9.x
[Backport release-9.x] translate standard buttons
|
2024-10-28 22:36:29 +02:00 |
|
Trial97
|
130714a9ab
|
translate standard buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bd82737efbb99dfc488d6d073046e5fe62693a9e)
|
2024-10-28 20:34:51 +00:00 |
|
Tayou
|
bf57d77075
|
Merge pull request #3017 from PrismLauncher/backport-3002-to-release-9.x
|
2024-10-28 14:24:25 +01:00 |
|
Trial97
|
98fe035442
|
replace unzipping with unpacking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9eb1ce3ad7dde0b2ca551b0b281081724e6fd58e)
|
2024-10-28 13:23:42 +00:00 |
|
Trial97
|
8e4994590b
|
fix unzipping typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 685d3c79ac78d7e41ab257de82dc743020189a33)
|
2024-10-28 13:23:42 +00:00 |
|
Tayou
|
0722dba820
|
Merge pull request #3016 from PrismLauncher/backport-3009-to-release-9.x
|
2024-10-28 14:04:52 +01:00 |
|
Trial97
|
9560447c92
|
swap search with filter button for modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 61448a61ea400eebd91f97aa07e9419cc2f35823)
|
2024-10-28 13:04:39 +00:00 |
|
Alexandru Ionut Tripon
|
4d89512ca1
|
Merge pull request #3013 from PrismLauncher/backport-3008-to-release-9.x
[Backport release-9.x] change contributors name
|
2024-10-27 22:30:02 +02:00 |
|
Trial97
|
42a6bd1151
|
change ZekeZ name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c4cd7cf6c173b7052f31614b4641d2172defa91a)
|
2024-10-27 19:31:56 +00:00 |
|
Trial97
|
f06505b138
|
change contributors name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f373a5cea0e816158cdabca3423107989aed0a85)
|
2024-10-27 19:31:56 +00:00 |
|
Evan Goode
|
5c8bdf99cd
|
Gray out "Manage Skins" button for authlib-injector accounts
Support for this is blocked by
https://github.com/unmojang/FjordLauncher/issues/37, which we can get to
after the 9.0 release.
|
2024-10-27 13:19:38 -04:00 |
|
Evan Goode
|
fab399c094
|
Remove extra code comment
|
2024-10-26 19:36:26 -04:00 |
|
Evan Goode
|
e177117a8f
|
Fix FTB import goof
|
2024-10-26 19:08:36 -04:00 |
|
Evan Goode
|
9a0f9a9f67
|
Fix Windows build
|
2024-10-26 18:30:16 -04:00 |
|
Evan Goode
|
95af313f49
|
Merge tag '9.1' into evan-goode/merge-9.0
|
2024-10-26 17:54:34 -04:00 |
|
Evan Goode
|
da9c085a06
|
Clean up some lingering differences from upstream
|
2024-10-26 17:52:25 -04:00 |
|
Evan Goode
|
b496316241
|
Change a few occurrences of "prism" to "fjord"
|
2024-10-26 16:45:14 -04:00 |
|
Evan Goode
|
c15afbda4a
|
Fix build?
|
2024-10-26 16:12:01 -04:00 |
|
Evan Goode
|
7f52d57454
|
Fix MSA login
|
2024-10-26 14:56:55 -04:00 |
|
Evan Goode
|
d40b6d8eb3
|
Error handling for Yggdrasil accounts
|
2024-10-26 13:40:09 -04:00 |
|