Commit Graph

3197 Commits

Author SHA1 Message Date
Samuel Stidham
bffb2a3609 Fixed the code.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf)
2024-05-18 10:16:15 +00:00
Samuel Stidham
0d3596c864 Add extra java locations for MacOs.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit 8e0af16de9)
2024-05-18 10:16:15 +00:00
Trial97
8898eb0a19 Add neoforge support for technic packs and atlauncher packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a95c1768a7)
2024-05-18 07:40:59 +00:00
Kenneth Chew
37af82a3c0 Fix bug where watched directories are not clickable on macOS
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit e7c95c9ccb)
2024-05-09 05:27:53 +00:00
Kenneth Chew
e1555ff74e Improved blocked mods dialog permissions prompt
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit 4787141698)
2024-05-09 05:27:53 +00:00
Alexandru Ionut Tripon
47e5855527
Merge pull request #2386 from PrismLauncher/backport-2366-to-release-8.x
[Backport release-8.x] Fix download packs with invalid characters
2024-05-09 08:23:49 +03:00
Trial97
7caed93d2c Fixed imports
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 30ce8ecb5f)
2024-05-09 05:16:33 +00:00
Trial97
c0706b30ee Ensure valid file names for resource names
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5400c24c73)
2024-05-09 05:16:33 +00:00
Trial97
a57a21af3b Fix invalid characters filename download on windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e068120375)
2024-05-09 05:16:33 +00:00
Trial97
b679a57939 Fixed NetRequest not failing on sink init
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 48f3ca56ba)
2024-05-09 05:16:32 +00:00
Alexandru Ionut Tripon
d3a16715b8 Update launcher/ui/widgets/VariableSizedImageObject.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 3c9a207192)
2024-05-09 05:15:48 +00:00
Trial97
28378c77aa Fix image width in project description
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c902da4461)
2024-05-09 05:15:48 +00:00
Alexandru Ionut Tripon
cf87aed7ff
Merge pull request #2360 from PrismLauncher/backport-2348-to-release-8.x
[Backport release-8.x] Use proxy style to force ActivateItemOnSingleClick off
2024-04-30 10:24:52 +03:00
TheKodeToad
257297d966 Use proxy style to force ActivateItemOnSingleClick off
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e3f55f6865)
2024-04-30 05:56:01 +00:00
ColonelGerdauf
ea0c74b302 Change of parameters
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit a877f9146d)
2024-04-30 05:53:48 +00:00
ColonelGerdauf
c02257024e Renaming and removing redundancies
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit f91f97e56d)
2024-04-30 05:53:48 +00:00
Trial97
119ee7a5b4 Fixed curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a5b059ebad)
2024-04-29 16:30:17 +00:00
Trial97
c74099ec7b Fixed windows bundled java path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ae98f4f90)
2024-04-24 15:46:21 +00:00
Trial97
f06bd54d6f Removed duplicate local
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 10d1720da5)
2024-04-23 16:19:50 +00:00
Trial97
0b535e44e1 Changed env variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73c3794c1b)
2024-04-23 16:19:50 +00:00
Trial97
877de6da40 Fixed windows appdata path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dac7027846)
2024-04-23 16:19:50 +00:00
Trial97
c330452e84 Fix bundled java detection on mac
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dbfd535b38)
2024-04-23 16:19:50 +00:00
William Gray
47bd02637a Update JavaUtils.cpp
Signed-off-by: William Gray <ruwagray@gmail.com>
(cherry picked from commit 9f4654ede9)
2024-04-21 17:45:15 +00:00
TheKodeToad
7960282e07 Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 252406ba3e)
2024-04-20 07:50:01 +00:00
Trial97
160c8cb70d Fixed application close on open file dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9f48694eb2)
2024-04-18 21:13:03 +00:00
Trial97
1a44258c9d Fixed crash on invalid curseforge link on import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cc58fe62c)
2024-04-08 21:20:14 +00:00
TheKodeToad
d9b133a28d Use UTF-8 for ZIP creation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d72bd70c05)
2024-04-06 13:01:11 +00:00
TheKodeToad
e43341ce92 Fix unicode characters being invalid in filenames
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9986fe4c45)
2024-04-06 12:54:15 +00:00
Trial97
b2cca30cd9 Moved getPathNameInLocal8bit inside FileSystem namespace
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ddcadcdd1)
2024-04-06 12:40:35 +00:00
Trial97
3e5e131a94 Moved the creation of natives folder in ExtractNatives task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8ecab305ac)
2024-04-06 12:40:35 +00:00
Trial97
1e5a29c423 Fixed crash on non-latin instance name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 450b73328e)
2024-04-06 12:40:35 +00:00
TheKodeToad
17d5d78a5b Replace invalid characters when extracting ZIP
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8056a2fa46)
2024-04-06 12:18:29 +00:00
Alexandru Ionut Tripon
99203cbd9b
Merge pull request #2253 from Trial97/manual_backport
Manual backport to 8.x
2024-03-28 14:47:45 +02:00
Trial97
d262a081c5
fixed const stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-28 14:44:32 +02:00
Alexandru Ionut Tripon
f9df20aae3
Update launcher/ui/pages/modplatform/ImportPage.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-03-28 14:44:26 +02:00
Trial97
fc4b5205dd
Added all supported files filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-28 14:44:20 +02:00
Alexandru Ionut Tripon
7c2a9df98e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-03-28 14:43:49 +02:00
Alexandru Ionut Tripon
b854c56c8c
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-03-28 14:43:40 +02:00
Trial97
2c864a4aad
added more microsoft error codes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-28 14:43:30 +02:00
Trial97
b255c8b17f
Changed the trait name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-28 14:39:32 +02:00
chouzz
ca3516d26d Add totalTimePlayed for FTBApp import
Signed-off-by: chouzz <zhouhua852@gmail.com>
(cherry picked from commit 92113e233a)
2024-03-28 12:36:36 +00:00
Trial97
1a379280b8 Fixed curesforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 05487152fe)
2024-03-28 08:41:26 +00:00
Tayou
a8553e7897 add line back to group separator
Signed-off-by: Tayou <git@tayou.org>
(cherry picked from commit 877eb4172a)
2024-03-03 17:38:44 +00: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
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