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

9196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luna
10991d9556 Update README.md 2024-10-29 03:33:17 -05:00
Luna
e5e86a1211 Update README.md 2024-10-29 03:33:17 -05:00
Luna
f6c44570af correct copyright and license 2024-10-29 03:33:17 -05:00
Luna
ea7d9c0a8d fix typo preventing linux builds 2024-10-29 03:30:29 -05:00
Luna
1b95061bcf Adjust branding to that of ShatteredPrism 2024-10-29 03:29:24 -05:00
Luna
168b980d7a Remove DRM, Bump Version, Re-enable Updater. 
Doing this in hopes it is easier to base upon the new version, alongside hopes of the patch system not breaking the updater.
 2024-10-29 02:57:00 -05:00
Evan Goode
0f33e12922 Remove extra search bars in FtbAppImport and Modrinth pages 2024-10-28 22:12:48 -04:00
Evan Goode
04703d83ee Delete remaining Mojang cruft 2024-10-28 22:07:15 -04:00
Evan Goode
5c8bdf99cd Gray out "Manage Skins" button for authlib-injector accounts 
Support for this is blocked by
https://github.com/unmojang/FjordLauncher/issues/37, which we can get to
after the 9.0 release.
 2024-10-27 13:19:38 -04:00
Evan Goode
fab399c094 Remove extra code comment 2024-10-26 19:36:26 -04:00
Evan Goode
e177117a8f Fix FTB import goof 2024-10-26 19:08:36 -04:00
Evan Goode
9a0f9a9f67 Fix Windows build 2024-10-26 18:30:16 -04:00
Evan Goode
95af313f49 Merge tag '9.1' into evan-goode/merge-9.0 2024-10-26 17:54:34 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00
Evan Goode
d40b6d8eb3 Error handling for Yggdrasil accounts 2024-10-26 13:40:09 -04:00
Evan Goode
c32aaf244d It compiles, Yggdrasil login working except error handling 2024-10-26 00:17:24 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
TheKodeToad
07addf2449
Bump version to 9.1 2024-10-24 13:32:23 +01:00
TheKodeToad
eea119d9c9
Merge remote-tracking branch 'TheKodeToad/vc-redist-norestart' into 9.1-hotfix 2024-10-24 13:31:21 +01:00
TheKodeToad
78e24962f9
Fix /norestart 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-21 14:41:48 +01:00
Alexandru Ionut Tripon
e8c9722a53
Merge pull request #2939 from PrismLauncher/backport-2938-to-release-9.x 
[Backport release-9.x] fix sparkle signature
 2024-10-21 00:08:40 +03:00
Trial97
9a810dfa6e fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0586d38e03)
 2024-10-20 21:07:55 +00:00
Alexandru Ionut Tripon
a8c3a49cb9
Merge pull request #2938 from Trial97/fix_sparkle 
fix sparkle signature
 2024-10-21 00:05:57 +03:00
Trial97
0586d38e03
fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-20 23:53:23 +03:00
ZekeZ
3ac080806d
Merge pull request #2831 from Trial97/fix_login 
split the auth loading screen
 2024-10-21 00:14:36 +10:00