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

9224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luna
0565bd7c68
Update README.md 2025-03-04 23:12:53 -06:00
Luna
3e46252058
Adjust README in line of making the project's history more clear eventually 2025-03-04 22:44:12 -06:00
Luna
8239d03e0e
Update authlib-injector to point to local doc rather than fjord's 2025-02-26 15:19:00 -06:00
Luna
62fdcd5c33
Bump to 1.6 2025-02-26 01:27:51 -06:00
Luna
fa9259a167 Revert "README: Don't mention fjordlauncher-bin MPR package" 
This reverts commit f66c5b116f.
 2025-02-25 23:29:09 -06:00
Luna
11d1952696 Merge branch 'develop' of https://github.com/LunaisLazier/ShatteredPrism into develop 2025-02-25 23:28:28 -06:00
Luna
1220f8fd6e Fix instance launching drm issue + MSA Log-in Dialogue re-appearing 
Hopefully fixes #3
 2025-02-25 23:28:00 -06:00
Luna
19f5f25540
Merge pull request #2 from LunaisLazier/update_flake_lock_action 
chore(nix): update lockfile
 2025-02-25 23:07:36 -06:00
Luna
c95eedd72c Update copyright dates to 2025 2025-02-25 22:32:05 -06:00
Alexandru Ionut Tripon
631d465583 Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:18 -06:00
Alexandru Ionut Tripon
b65d0d1fe6 Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -06:00
Trial97
f56dfbafb2 remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -06:00
Trial97
de438aea84 fix appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -06:00
Evan Goode
3ec0820b45 Merge pull request #56 from unmojang/evan-goode/feed-the-beast 
Use api.feed-the-beast.com, not modpacks.ch
 2025-02-25 22:25:17 -06:00
Evan Goode
07dac3127a Use api.feed-the-beast.com, not modpacks.ch 2025-02-25 22:25:17 -06:00
Evan Goode
67e6e5e7b1 Merge pull request #51 from unmojang/evan-goode/fix-selectedProfile 
Only send `selectedProfile` when selecting a profile
 2025-02-25 22:25:17 -06:00
Evan Goode
80baecf088 Remove irrelevant FIXME comment 2025-02-25 22:25:17 -06:00
Evan Goode
b1e0b70833 Only send selectedProfile when selecting a profile 
Some authentication servers (Blessing Skin) care when selectedProfile is
sent on POST /refresh but the clientToken is already bound to a profile.
We should only include selectedProfile in POST /refresh during the
initial "Add authlib-injector account" process when selecting a profile
from multiple availableProfiles.

For https://github.com/unmojang/FjordLauncher/issues/50
 2025-02-25 22:25:17 -06:00
Evan Goode
f66c5b116f README: Don't mention fjordlauncher-bin MPR package 
prismlauncher-bin [1] is out of date and so fjordlauncher-bin also hasn't been updated in a while. Not sure whether -bin packages are dangerous on MPR as they are on AUR, so we'll just omit it from the install instructions for now.

[1] https://mpr.makedeb.org/packages/prismlauncher-bin
 2025-02-25 22:25:17 -06:00
github-actions[bot]
2c5a869dba chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/fa42b5a5f401aab8a32bd33c9a4de0738180dc59?narHash=sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo%3D' (2024-11-28)
  → 'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
 2025-02-23 01:19:53 +00:00
Evan Goode
31d99a35e7 Fix FetchFlameAPIKey compile error 2025-01-12 12:46:48 -06:00
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Evan Goode
2c014a075d Not yet in nixpkgs 
Resolves #46
 2025-01-12 12:43:54 -06:00
Evan Goode
6b6da03aa4 chore(nix): nixfmt 2025-01-12 12:43:41 -06:00
Evan Goode
6ec444e0c4 chore(nix): sync with upstream Prism Launcher 2025-01-12 12:38:34 -06:00
Evan Goode
e0088f7811 Merge pull request #42 from ryze312/nix 
Nix: Update lock file and switch to addDriverRunpath
 2025-01-12 12:30:56 -06:00
Luna
9d66c25d42 Revert "Merge pull request #42 from ryze312/nix" 
This reverts commit d7e190cabb.
 2025-01-11 14:19:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2" 
This reverts commit b4b9051793.
 2025-01-11 14:19:46 -06:00
Luna
32b45d0fd7 Revert "Parity with Upstream towards Nix" 
This reverts commit 4de9053c05.
 2025-01-11 14:19:43 -06:00
Luna
2129244378 Revert "revert auth parent changes" 
This reverts commit cbcbda6d4c.
 2025-01-11 14:19:39 -06:00
Luna
cbcbda6d4c revert auth parent changes 2025-01-11 14:11:12 -06:00
Luna
4de9053c05 Parity with Upstream towards Nix 2025-01-11 13:58:43 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Evan Goode
d7e190cabb Merge pull request #42 from ryze312/nix 
Nix: Update lock file and switch to addDriverRunpath
 2025-01-11 13:02:27 -06:00
Luna
1a02c19176 correct some instances of "fjord" to "shattered/shattered prism" 2025-01-11 13:00:30 -06:00
Evan Goode
8990841c8b Add dialog to select profile if multiple availableProfiles 
Resolves https://github.com/unmojang/FjordLauncher/issues/29 and
obsoletes https://github.com/unmojang/FjordLauncher/pull/34.

This implementation follows the authlib-injector specification:
https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E8%B4%A6%E6%88%B7%E7%9A%84%E6%B7%BB%E5%8A%A0
([Google translate to English](https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US))
 2024-11-29 08:32:14 -06:00
Evan Goode
a1537bf42d Add Spaceship and Phoebe catpack 2024-11-29 08:32:14 -06:00
Luna
d08118b05a restore original versioning without causing nix breakage(?) 2024-11-29 08:31:50 -06:00
Luna
72a8ff070e Revert "Remove patch system as updater breaks." 
This reverts commit fec49be639.
 2024-11-29 08:31:27 -06:00
Luna
6f8fc48839 Revert "fix nix builds again(?)" 
This reverts commit 25d90beb12.
 2024-11-29 08:31:13 -06:00
Luna
25d90beb12 fix nix builds again(?) 2024-10-30 03:48:52 -05:00
Luna
fec49be639 Remove patch system as updater breaks. 2024-10-30 00:11:37 -05:00
Luna
f70084972a Fix builds, restore PollyMC to contributors list. 2024-10-29 23:00:35 -05:00
Luna
2921db3e19 Add Pseurae to in-launcher Contributors list, revert readme changes 2024-10-29 19:44:51 -05:00
Luna
4d0b910ead
Merge pull request #1 from Pseurae/merge-9.0 
Possible fix for failing Nix builds
 2024-10-29 19:35:54 -05:00
Adhith Chand Thiruvath
4ae137c8d3
Update .markdownlint.yaml 2024-10-30 05:46:43 +05:30
Luna
f8469afe2b test if nix readme is the breakage for nix builds 2024-10-29 18:36:52 -05:00
Luna
02a60f97c3 adjust missed fjords to shattered in hopes of fixing builds 2024-10-29 03:48:04 -05:00
Luna
a03b3d8c7a Fix overlooked branding errors 2024-10-29 03:36:32 -05:00
Luna
707f9026f3 Update README.md 2024-10-29 03:33:18 -05:00