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

9223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
ef4e5eb3cf
fixed java build option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-18 19:15:36 +02: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
Trial97
1322277ae6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
Trial97
05487152fe
Fixed curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-17 20:53:26 +02:00
Sefa Eyeoglu
46616d1c5d
Merge pull request #2219 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-03-17 09:33:55 +01:00
github-actions[bot]
95c3daca59 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0e7f98a5f30166cbed344569426850b21e4091d4' (2024-03-09)
  → 'github:nixos/nixpkgs/9af9c1c87ed3e3ed271934cb896e0cdd33dae212' (2024-03-15)
 2024-03-17 00:19:13 +00:00
Sefa Eyeoglu
e288ee6ddd
Merge pull request #2217 from AtomHare/develop 2024-03-16 13:04:18 +01:00
AtomHare
853e4a13ab
fix: Compressing typo 
Signed-off-by: AtomHare <29772841+AtomHare@users.noreply.github.com>
 2024-03-16 12:44:55 +01:00
Sefa Eyeoglu
3b0564f098
Merge pull request #2183 from PrismLauncher/update_flake_lock_action 2024-03-10 02:45:42 +01:00
github-actions[bot]
75628bf81e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
  → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f63ce824cd2f036216eb5f637dfef31e1a03ee89' (2024-02-24)
  → 'github:nixos/nixpkgs/0e7f98a5f30166cbed344569426850b21e4091d4' (2024-03-09)
 2024-03-10 00:19:11 +00:00
chouzz
92113e233a Add totalTimePlayed for FTBApp import 
Signed-off-by: chouzz <zhouhua852@gmail.com>
 2024-03-09 19:36:40 +08:00
Sefa Eyeoglu
51443fce8b
Merge pull request #2206 from PrismLauncher/renovate/softprops-action-gh-release-2.x 2024-03-08 22:41:23 +01:00
renovate[bot]
03def913ad
chore(deps): update softprops/action-gh-release action to v2 2024-03-08 21:26:24 +00:00
Alexandru Ionut Tripon
634ab279b0
Merge pull request #2204 from PrismLauncher/renovate/cachix-install-nix-action-26.x 
chore(deps): update cachix/install-nix-action action to v26
 2024-03-08 10:08:00 +02:00
renovate[bot]
6591379a8a
chore(deps): update cachix/install-nix-action action to v26 2024-03-08 07:47:18 +00:00
Trial97
9120848278
Made java downloader as a build option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-06 19:33:14 +02:00
Alexandru Ionut Tripon
a0311780c1
Merge pull request #1866 from Trial97/supported_files 
Added all supported files filter
 2024-03-06 17:21:56 +02: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
Alexandru Ionut Tripon
fd9a4eed9e
Merge pull request #2196 from DioEgizio/bump-9.0 
chore: bump develop to 9.0
 2024-03-04 17:45:22 +02:00
DioEgizio
d6abcb73c5 chore: bump develop to 9.0 
until it's too late lol

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-04 16:32:45 +01: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
Tayou
ca1b68b7ca
Merge pull request #2185 from PrismLauncher/backport-2178-to-release-8.x 
[Backport release-8.x] (More) mrpack export fixes
 2024-03-03 16:46:48 +01: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
Tayou
1627f3c63b
Merge pull request #2178 from TheKodeToad/mrpack-fixes 
(More) mrpack fixes
 2024-03-03 16:30:40 +01:00
Sefa Eyeoglu
8ad7c37d5e
Merge pull request #2184 from PrismLauncher/backport-2160-to-release-8.x 2024-03-03 15:18:38 +01: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
TheKodeToad
3b02b6b7d7 Add error when staging folder could not be created 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit df60f5cc96)
 2024-03-03 14:07:08 +00:00
TheKodeToad
82584e5d7e Delete staging on abort 
Previously instances would get "stuck" in the folder

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9574ebe480)
 2024-03-03 14:07:08 +00:00
TheKodeToad
6c8ee3dfa9 Re-randomise key until it does not collide 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 6a9f5540d3)
 2024-03-03 14:07:08 +00:00
Trial97
f9ba4a746e Updated application manifest 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit aac6fea724)
 2024-03-03 14:07:08 +00:00
Trial97
e37cf125c3 Reduced temporary instance folder name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 726b0ffb3b)
 2024-03-03 14:07:08 +00:00
Sefa Eyeoglu
0dc2bf2681
Merge pull request #2160 from TheKodeToad/temp_folder 2024-03-03 15:06:52 +01:00
txtsd
ad8c3ca54b
Merge pull request #2177 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.0.1
 2024-03-03 07:52:47 +00:00
TheKodeToad
4101fbb634
Allow multiline description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-03-01 01:05:03 +00:00
TheKodeToad
138df66355
Fix server side mods being marked as unsupported on client 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-03-01 00:03:20 +00:00
renovate[bot]
e1146455a3
chore(deps): update actions/cache action to v4.0.1 2024-02-29 23:16:59 +00:00
Sefa Eyeoglu
850e48ec67
Merge pull request #2176 from PrismLauncher/renovate/determinatesystems-update-flake-lock-21.x 2024-02-29 19:06:29 +01:00
renovate[bot]
322a8899ed
chore(deps): update determinatesystems/update-flake-lock action to v21 2024-02-29 17:19:39 +00:00
Trial97
41d52dc347
Remove dependencies if review mods is rejected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-29 00:06:28 +02:00
Trial97
27e76d0dcb
Removed static path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-27 17:11:19 +02:00
Trial97
24fd07861b
format code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-26 22:25:14 +02:00
Alexandru Ionut Tripon
da96172b0b
Apply suggestions from code review 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-02-26 22:00:40 +02:00