ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
7,901 Commits 4 Branches 5 Tags 40 MiB
26a70d74fe
Commit Graph

7901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
DioEgizio
4642c13ca4
fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-28 14:42:04 +02:00
Trial97
b255c8b17f
Changed the trait name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:39:32 +02:00
Alexandru Ionut Tripon
c0f14c569b
Merge pull request #2252 from PrismLauncher/backport-2209-to-release-8.x 
[Backport release-8.x] Add totalTimePlayed for FTBApp import
 2024-03-28 14:36:47 +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
timoreo
067fcaf0d9
Merge pull request #2250 from PrismLauncher/backport-2221-to-release-8.x 
[Backport release-8.x] Set Forge version correctly when exporting to CurseForge
 2024-03-28 09:56:40 +01: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
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04:00
Evan Goode
8f254cb63b Use either authlib-injector or system properties, not both 
Resolves https://github.com/fn2006/PollyMC/issues/154

In 1.20+, authlib-injector wants to intercept
https://api.minecraftservices.com/publickeys [0], but if we override the
services server using -Dminecraft.api.services.host, the request does
not get intercepted.

That's not an issue for API servers that implement the /publickeys
route, but Ely.by does not. A decent solution is to not set these
-Dminecraft.api.*.host system properties when authlib-injector is
available, since authlib-injector expects authlib to make requests to
Mojang's API servers.

[0] 18a0ce2669
 2024-03-18 13:05:46 -04:00
Evan Goode
639a7820fe Fix offline multiplayer in 1.16.4-1.16.5 
Resolves https://github.com/fn2006/PollyMC/issues/150

If the game is launched in offline mode, pass invalid API servers via
the -Dminecraft.api.* system properties. This workaround is mentioned
here:
https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390

I think this change is appropriate to make here in PollyMC even though
the Fabric developers decided against using it there. If a user wants to
override the API servers back to the vanilla values (in order to use
Auth Me or something), they can do so by setting the following custom
JVM args on the instance:

-Dminecraft.api.env=PROD
-Dminecraft.api.auth.host=https://authserver.mojang.com
-Dminecraft.api.account.host=https://api.mojang.com
-Dminecraft.api.session.host=https://sessionserver.mojang.com
-Dminecraft.api.services.host=https://api.minecraftservices.com

Previously, auth args would override any user-specified args, but this
patch also changes that behavior so user-specified args are now passed
last.
 2024-03-04 21:53:58 -05:00
furokku floc
d4635c1a04
forgot a thing 2024-03-03 23:08:22 +02:00
furokku floc
6e29802de9
change tabs to spaces 2024-03-03 23:06:12 +02:00
Sefa Eyeoglu
284633ff91
Merge pull request #2188 from Scrumplex/bump-8.2 2024-03-03 20:37:21 +01:00
Sefa Eyeoglu
a7bfd08ce3
chore: bump to 8.2 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-03-03 20:35:43 +01:00
Sefa Eyeoglu
8c5cc43fc5
Merge pull request #2186 from PrismLauncher/backport-1923-to-release-8.x 2024-03-03 18:40:15 +01: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