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

7546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SabrePenguin
5d25e21719
Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
875c6bbada
Switched </ul> to a Regex expression 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
401de52f61
Moved html patch to StringUtils 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
0c84d58915
Fix img tag allowing img.... 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
096028f1a6
Pleasing the format check 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
fa0492f606
Update launcher/Markdown.cpp 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
e201cad3f8
Formatting and fixed img_pos allowed as negative 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
1d8ee37504
Added a naive implementation of a <br> inserter 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
Alexandru Ionut Tripon
672c8c8b4c
Merge pull request #2453 from PrismLauncher/backport-2423-to-release-8.x 
[Backport release-8.x] fix incorrect launch time
 2024-05-31 09:58:11 +03:00
Alexandru Ionut Tripon
87ca2ce303
Merge pull request #2452 from PrismLauncher/backport-2438-to-release-8.x 
[Backport release-8.x] Added support for bcachefs
 2024-05-31 09:58:04 +03:00
Trial97
905d9d2826 fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b0e8260ac3b992a1e60e88d9a7217c8c8a66bfc)
 2024-05-31 06:17:25 +00:00
Celeste Peláez
ca359330c2 Reformatted FileSystem.h 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit f5f32e2c6e7644577e2f583a975d2f9b0df405a1)
 2024-05-31 06:12:46 +00:00
Celeste Peláez
828222eb27 Added support for bcachefs 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit a2b5ac73ff1464d9c2cb70412ac57d3c9811d5d9)
 2024-05-31 06:12:46 +00:00
Alexandru Ionut Tripon
f7cad1110e
Merge pull request #2411 from PrismLauncher/backport-2377-to-release-8.x 
[Backport release-8.x] Adding sdkman java location to MacOs
 2024-05-18 13:16:44 +03:00
Samuel Stidham
bffb2a3609 Fixed the code. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf2d27148139da2965900a9b3c1ec389)
 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 8e0af16de979ba92e9983b47c44ee0f321fcb116)
 2024-05-18 10:16:15 +00:00
Alexandru Ionut Tripon
8eeab0805a
Merge pull request #2410 from PrismLauncher/backport-2382-to-release-8.x 
[Backport release-8.x] Add neoforge support for technic packs and atlauncher packs
 2024-05-18 10:41:15 +03:00
Trial97
8898eb0a19 Add neoforge support for technic packs and atlauncher packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a95c1768a778f3ade8d61fef4c636a21a55bb4fe)
 2024-05-18 07:40:59 +00:00
Alexandru Ionut Tripon
43286eea91
Merge pull request #2387 from PrismLauncher/backport-2379-to-release-8.x 
[Backport release-8.x] Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
 2024-05-09 08:28:59 +03: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 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