Tayou
ca1b68b7ca
Merge pull request #2185 from PrismLauncher/backport-2178-to-release-8.x
...
[Backport release-8.x] (More) mrpack export fixes
2024-03-03 16:46:48 +01:00
TheKodeToad
1fe710777a
Allow multiline description
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 4101fbb634
2024-03-03 15:30:54 +00:00
TheKodeToad
e349e24548
Fix server side mods being marked as unsupported on client
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 138df66355
2024-03-03 15:30:54 +00:00
Sefa Eyeoglu
8ad7c37d5e
Merge pull request #2184 from PrismLauncher/backport-2160-to-release-8.x
2024-03-03 15:18:38 +01:00
TheKodeToad
b7f079b006
Fix build on Windows and formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit c0eb80947d
2024-03-03 14:07:08 +00:00
TheKodeToad
c39ca8852d
Fix a mistake
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit fccf857d8e
2024-03-03 14:07:08 +00:00
TheKodeToad
69a10e4b3d
Add upper-bound for randomisation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit bd0cd82826
2024-03-03 14:07:08 +00:00
TheKodeToad
3b02b6b7d7
Add error when staging folder could not be created
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit df60f5cc96
2024-03-03 14:07:08 +00:00
TheKodeToad
82584e5d7e
Delete staging on abort
...
Previously instances would get "stuck" in the folder
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9574ebe480
2024-03-03 14:07:08 +00:00
TheKodeToad
6c8ee3dfa9
Re-randomise key until it does not collide
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 6a9f5540d3
2024-03-03 14:07:08 +00:00
Trial97
f9ba4a746e
Updated application manifest
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit aac6fea724
2024-03-03 14:07:08 +00:00
Trial97
e37cf125c3
Reduced temporary instance folder name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 726b0ffb3b
2024-03-03 14:07:08 +00:00
Sefa Eyeoglu
b7dc0b83b2
Merge pull request #2153 from PrismLauncher/backport-2141-to-release-8.x
2024-02-22 12:37:54 +01:00
crpz1
0113456dea
Use empty list label code for welcome screen
...
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
(cherry picked from commit 9aa81cf005
2024-02-22 11:36:13 +00:00
seth
4add24696b
Merge pull request #2151 from DioEgizio/updates-backport
...
fix: fix sparkle signing backport
2024-02-22 06:10:30 -05:00
DioEgizio
c6441d231b
fix: fix sparkle signing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-22 11:53:48 +01:00
DioEgizio
438ccc41ef
Merge pull request #2136 from DioEgizio/updates-backport
2024-02-18 15:04:29 +01:00
Alexandru Ionut Tripon
80f863f6b6
Merge pull request #2135 from PrismLauncher/backport-2110-to-release-8.x
...
[Backport release-8.x] Fixed curseforge neoforge import for 1.20.1 versions
2024-02-18 15:02:54 +02:00
DioEgizio
d8e34e6c39
Merge pull request #2130 from DioEgizio/updates
2024-02-18 12:58:09 +01:00
Sefa Eyeoglu
c4cb36b9d5
Merge pull request #1951 from guihkx/sync-flatpak
2024-02-18 12:58:09 +01:00
Trial97
72c4a52119
Fixed curseforge neoforge export for 1.20.1
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fdaaee64d1
2024-02-18 11:42:43 +00:00
Alexandru Ionut Tripon
8eba326f62
Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 29bf6cc68c
2024-02-18 11:42:43 +00:00
Trial97
69d675dc76
Fixed curseforge neoforge import for 1.20.1 versions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 830ce246e1
2024-02-18 11:42:43 +00:00
Sefa Eyeoglu
e9991e99c0
Merge pull request #2129 from PrismLauncher/backport-2126-to-release-8.x
...
[Backport release-8.x] Use absolute path to load MangoHUD library
2024-02-17 09:22:51 +01:00
Echo J
6da36140eb
Use absolute path to load MangoHUD library
...
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183
Signed-off-by: Echo J <tcg96nougat@gmail.com>
(cherry picked from commit 01180c20e1
2024-02-17 00:57:29 +00:00
Sefa Eyeoglu
816c900edc
Merge pull request #2122 from PrismLauncher/backport-2112-to-release-8.x
2024-02-13 09:16:10 +01:00
TheKodeToad
4ebce79353
Use QTextFragment for inserting log lines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7cac8ad2b4
2024-02-13 08:16:01 +00:00
Sefa Eyeoglu
256ed2a038
Merge pull request #2121 from PrismLauncher/backport-2116-to-release-8.x
2024-02-13 09:15:05 +01:00
TheKodeToad
3f30e4c691
Fix formatting issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8cf2a04f31
2024-02-13 08:14:52 +00:00
TheKodeToad
ad9dbb4a68
Fix immediate free in Exception.h
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7f4c74ffbe
2024-02-13 08:14:52 +00:00
TheKodeToad
fb04b6fa85
Fix ResourceModel error display
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ff989b4305
2024-02-13 08:14:52 +00:00
TheKodeToad
6badd694c5
Fix NetJob use-after-free
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ded77e6183
2024-02-13 08:14:52 +00:00
TheKodeToad
6f5cddeec8
Merge pull request #2091 from PrismLauncher/revert-2084-backport-2050-to-release-8.x
...
Revert "[Backport release-8.x] Use `minecraft` instead of `.minecraft` for better accessibility"
2024-02-04 16:09:36 +00:00
TheKodeToad
25ba275230
Revert "[Backport release-8.x] Use minecraft instead of .minecraft for better accessibility"
2024-02-04 16:08:16 +00:00
furokku
2d2b082539
fixes #63
2024-02-03 23:42:19 +02:00
Tayou
cf6ffc3954
Merge pull request #2084 from PrismLauncher/backport-2050-to-release-8.x
...
[Backport release-8.x] Use `minecraft` instead of `.minecraft` for better accessibility
2024-02-01 18:29:46 +01:00
TheKodeToad
5e3b7d88ec
Use minecraft instead of .minecraft for better accessibility
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f54ac25614
2024-02-01 17:16:29 +00:00
Alexandru Ionut Tripon
1f5552dd81
Merge pull request #2064 from PrismLauncher/backport-2063-to-release-8.x
...
[Backport release-8.x] fix: remove alpha notice on modrinth packs
2024-01-24 18:13:58 +02:00
DioEgizio
a2aede0d94
fix: remove alpha notice on modrinth packs
...
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 8de1060bfb
2024-01-24 16:13:32 +00:00
BatteredBunny
187475e35f
Adjusted AuthServerColumn to return authlibInjectorUrl instead of authServerUrl, make the column auto-resize
...
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
2024-01-23 22:38:41 +02:00
Sefa Eyeoglu
2fd5635b2d
Merge pull request #2057 from PrismLauncher/backport-2053-to-release-8.x
2024-01-23 09:30:59 +01:00
Trial97
bc63e1906f
Fixed open path a second time
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 12bf913764
2024-01-23 08:30:16 +00:00
BatteredBunny
5c95f10f64
Add auth server column to account list
...
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
2024-01-19 00:40:35 +02:00
Alexandru Ionut Tripon
a8b168dc1f
Merge pull request #2043 from PrismLauncher/backport-1913-to-release-8.x
...
[Backport release-8.x] Fixed askIfShouldUpdate dialog on mac
2024-01-18 22:06:12 +02:00
Trial97
fce2163350
Fixed askIfShouldUpdate dialog on mac
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 577c737d68
2024-01-18 20:05:30 +00:00
Sefa Eyeoglu
5d0c83dec2
Merge pull request #1768 from Trial97/toggle_deps2
2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
557fce577a
Merge pull request #1825 from Trial97/ftb_import
2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
bcb5b9c9c2
Merge pull request #2034 from Scrumplex/feat/macos-signing
2024-01-18 17:00:00 +01:00
Sefa Eyeoglu
428260b91f
Merge pull request #2035 from PrismLauncher/backport-1954-to-release-8.x
2024-01-17 15:19:48 +01:00
Sefa Eyeoglu
fec1a00dc8
fix: simplify openPath calls
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53
2024-01-17 14:19:03 +00:00
