Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-12 20:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,576 Commits 10 Branches 38 Tags
Commit Graph

7576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 e7c95c9ccb92474cbbaf125814d3085a63b2b746)
 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 47871416982836e282e2da373a317d3df0cf4f38)
 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
Alexandru Ionut Tripon
3328ec970a
Merge pull request #2385 from PrismLauncher/backport-2341-to-release-8.x 
[Backport release-8.x] Fix image width in project description
 2024-05-09 08:23:32 +03:00
Trial97
7caed93d2c Fixed imports 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 30ce8ecb5ff08bcec110b3b291025cfd72d4d4fe)
 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 5400c24c7324213a1af102c96e8bd6f9be672006)
 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 e06812037560036b2c1ade1e75b06fce1f8a13bf)
 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 48f3ca56bafcf1a7e10b865a910221eefe6b84d0)
 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 3c9a207192e680262d44f25b509a77d74dd6dbe0)
 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 c902da446174840c38fee8c8ff20ab2b21699739)
 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
Alexandru Ionut Tripon
d43653605f
Merge pull request #2359 from PrismLauncher/backport-2292-to-release-8.x 
[Backport release-8.x] Remove old version variants in instance creation
 2024-04-30 10:24:22 +03:00
TheKodeToad
257297d966 Use proxy style to force ActivateItemOnSingleClick off 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e3f55f68657f63c15933dc0fdde4319390600a98)
 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 a877f9146de17a09b4803f6241f675d9a2ba739c)
 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 f91f97e56dd27fe4fb355a800e853c782f92baa6)
 2024-04-30 05:53:48 +00:00
Alexandru Ionut Tripon
098f1f1281
Merge pull request #2357 from PrismLauncher/backport-2353-to-release-8.x 
[Backport release-8.x] Fix CurseForge export caused by utf8 enabled
 2024-04-29 19:30:37 +03:00
Trial97
119ee7a5b4 Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a5b059ebad1221d10eeb5d4b953817441fabfd1d)
 2024-04-29 16:30:17 +00:00
Sefa Eyeoglu
87354d9a7d
Merge pull request #2354 from Trial97/bump8.4 2024-04-29 13:14:07 +02:00
Trial97
46a9880e2e
chore: bump to 8.4 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 13:48:56 +03:00
timoreo
1daf4ad85f
Merge pull request #2339 from PrismLauncher/backport-2337-to-release-8.x 2024-04-24 18:03:43 +02:00
Trial97
c74099ec7b Fixed windows bundled java path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ae98f4f901200647ea3b4ff855248705f28fd3b)
 2024-04-24 15:46:21 +00:00
TheKodeToad
4cd6ac5fe5
Merge pull request #2334 from PrismLauncher/backport-2333-to-release-8.x 
[Backport release-8.x] Fix Minecraft Launcher runtime detection on Windows and macOS
8.3 		2024-04-23 17:20:44 +01:00
Trial97
f06bd54d6f Removed duplicate local 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 10d1720da5c350250390fa8b38a5c4db6429462b)
 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 73c3794c1bfa9d3cd01339039ad8597971b5fb53)
 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 dac70278462913b7c0191c56a04e62529d5c774b)
 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 dbfd535b38d799a773b3843709bbeae7f5a9e7d3)
 2024-04-23 16:19:50 +00:00
Alexandru Ionut Tripon
3f3af4134e
Merge pull request #2330 from Trial97/appimage_backport 
Removed java from appimage backport
 2024-04-23 00:06:36 +03:00
Trial97
565c7d81b3
Removed java from appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 00:04:51 +03:00
Alexandru Ionut Tripon
a532c99aa5
Merge pull request #2329 from PrismLauncher/backport-2327-to-release-8.x 
[Backport release-8.x] Add Gradle Toolchains to java scan list
 2024-04-21 20:56:05 +03:00
William Gray
47bd02637a Update JavaUtils.cpp 
Signed-off-by: William Gray <ruwagray@gmail.com>
(cherry picked from commit 9f4654ede91a81a3d1099c949164690e295995a4)
 2024-04-21 17:45:15 +00:00
Alexandru Ionut Tripon
64797b8bff
Merge pull request #2322 from PrismLauncher/backport-2319-to-release-8.x 
[Backport release-8.x] Support mod info for NeoForge 20.5
 2024-04-20 12:04:47 +03:00
TheKodeToad
7960282e07 Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 252406ba3e793b4b096ed1e7bde43c2d2a9c2eca)
 2024-04-20 07:50:01 +00:00
Alexandru Ionut Tripon
cb0fe08bed
Merge pull request #2314 from PrismLauncher/backport-2294-to-release-8.x 
[Backport release-8.x] Fixed application close on open file dialog
 2024-04-19 00:13:36 +03:00
Trial97
160c8cb70d Fixed application close on open file dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9f48694eb2be5f62efb122b554c7066e49f3383d)
 2024-04-18 21:13:03 +00:00
TheKodeToad
13afbd5699
Merge pull request #2286 from DioEgizio/updates-backport 
Update to Qt 6.6.3
 2024-04-15 11:23:34 +01:00
Alexandru Ionut Tripon
7b1c5a7e1a
Merge pull request #2293 from PrismLauncher/backport-2291-to-release-8.x 
[Backport release-8.x] Fixed crash on invalid curseforge link on import
 2024-04-09 00:20:31 +03:00
Trial97
1a44258c9d Fixed crash on invalid curseforge link on import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cc58fe62c776dd206bb6dd99c886ce491662214)
 2024-04-08 21:20:14 +00:00
DioEgizio
95cfcedc96 chore: update to qt 6.6.3 on 8.x 
qt bug fix release

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-06 20:23:01 +02:00
Alexandru Ionut Tripon
5f7a5bfa2d
Merge pull request #2281 from Scrumplex/bump-8.3 
Bump to 8.3
 2024-04-06 16:15:38 +03:00
Sefa Eyeoglu
f221b08f11
chore: bump to 8.3 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-04-06 15:12:41 +02:00
Alexandru Ionut Tripon
0af9bde06f
Merge pull request #2280 from PrismLauncher/backport-2225-to-release-8.x 
[Backport release-8.x] Use UTF-8 for ZIP creation
 2024-04-06 16:02:24 +03:00
TheKodeToad
d9b133a28d Use UTF-8 for ZIP creation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d72bd70c055d23223ee78fa62e6ae4ccfcb490d7)
 2024-04-06 13:01:11 +00:00
Alexandru Ionut Tripon
3477b8c2c2
Merge pull request #2279 from PrismLauncher/backport-2277-to-release-8.x 
[Backport release-8.x] Fix unicode characters being invalid in filenames
 2024-04-06 15:57:24 +03:00
TheKodeToad
e43341ce92 Fix unicode characters being invalid in filenames 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9986fe4c45be7f3ce22fdce64812677f16cf7b4c)
 2024-04-06 12:54:15 +00:00
Alexandru Ionut Tripon
acfd05a70e
Merge pull request #2278 from PrismLauncher/backport-2247-to-release-8.x 
[Backport release-8.x] Fixed crash on non-latin instance name
 2024-04-06 15:41:38 +03:00
Trial97
b2cca30cd9 Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ddcadcdd1f72f8135333986e55cf583204da1e2)
 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 8ecab305ac67afb70a278d286df13cc85134dec2)
 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 450b73328e20941eba12be3b7c7f8bb13dc0f944)
 2024-04-06 12:40:35 +00:00
timoreo
5b168dd7b1
Merge pull request #2276 from PrismLauncher/backport-2275-to-release-8.x 2024-04-06 14:28:40 +02:00
TheKodeToad
17d5d78a5b Replace invalid characters when extracting ZIP 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8056a2fa460b11739b080d96deda35cd8897c40c)
 2024-04-06 12:18:29 +00:00