Commit Graph

7873 Commits

Author SHA1 Message Date
Evan Goode
ddaf525cf7 Update flake.lock 2024-05-03 19:03:32 -04:00
Evan Goode
614615a5fd Merge branch 'unmojang/fix-1.20' into develop 2024-05-03 17:44:15 -04:00
Evan Goode
d0550e998d Merge branch 'unmojang/fix-1.16-offline' into develop 2024-05-03 17:31:39 -04:00
Evan Goode
c0dc59ecfb whitespace 2024-05-03 17:31:00 -04:00
Evan Goode
e0796e5260 Merge remote-tracking branch 'furokku/develop' into develop 2024-05-03 17:28:03 -04:00
Evan Goode
ee040668f0 Merge remote-tracking branch 'BatteredBunny/auth_server_name' into develop 2024-05-03 17:25:58 -04:00
Evan Goode
eba77dc8a3 Trim whitespace surrounding authlib-injector URL
For https://github.com/fn2006/PollyMC/issues/134
2024-05-03 17:25:01 -04: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 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
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 a5b059ebad)
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
BatteredBunny
1d2590b024 Clean up
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
2024-04-25 11:40:01 +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 5ae98f4f90)
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
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 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
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 9f4654ede9)
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 252406ba3e)
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 9f48694eb2)
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 9cc58fe62c)
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 d72bd70c05)
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 9986fe4c45)
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 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
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 8056a2fa46)
2024-04-06 12:18:29 +00:00
Alexandru Ionut Tripon
58d32ea1af
Merge pull request #2273 from PrismLauncher/backport-2268-to-release-8.x
[Backport release-8.x] [Linux] Add jdk21 to Nix packages
2024-04-04 20:39:00 +03:00
Sefa Eyeoglu
0a3b85dbc5 fix(nix): add jdk21
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0d372d2fbf)
2024-04-04 17:38:47 +00:00