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

3345 Commits

Author SHA1 Message Date
Evan Goode
67846827f5 Add DRM notice 2024-05-14 22:58:19 -04:00
Evan Goode
1e0cbf730c Correct copyright strings and credits 2024-05-07 00:55:40 -04:00
Evan Goode
4173436ba8 Fjord Launcher icons 2024-05-07 00:55:12 -04:00
Evan Goode
f1feb2d24d Support migration from PollyMC, Prism Launcher 2024-05-07 00:22:54 -04:00
Evan Goode
cb2f9b4e14 Crude s/PollyMC/Fjord Launcher 2024-05-04 00:08:42 -04:00
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04:00
Evan Goode
3e7b747926 Merge branch 'unmojang/8.2' into develop 2024-05-03 19:10:19 -04:00
Evan Goode
8acd7168dd Actually fix offline accounts on 1.16.4, 1.16.5 2024-05-03 19:07:44 -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
BatteredBunny
1d2590b024 Clean up 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-04-25 11:40:01 +03: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
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
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