Commit Graph

9183 Commits

Author SHA1 Message Date
Luna
4dbb1f4fc4 restore original versioning without causing nix breakage(?) 2024-11-29 08:07:49 -06: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
seth
38e0e0cb73
Merge pull request #2935 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-10-20 02:11:26 -04:00
github-actions[bot]
0501c1e17a chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
  → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
2024-10-20 00:25:22 +00:00
Alexandru Ionut Tripon
417bb3564d
Merge pull request #2933 from getchoo-contrib/flatpak/jdks
Don't bundle JREs in Flatpak
2024-10-19 22:33:05 +03:00
Alexandru Ionut Tripon
e43836a271
Merge pull request #2932 from getchoo-contrib/nix/enable-tests
Enable checks in Nix package
2024-10-19 22:32:59 +03:00
Alexandru Ionut Tripon
9a161a0335
Merge pull request #2930 from Trial97/fixes
Fix tests segfault
2024-10-19 22:32:51 +03:00
Trial97
2d234b127b
make sure that tests are only disabled fro cmark
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 22:07:31 +03:00
Rachel Powers
464c7c1d4d
Merge pull request #2929 from Trial97/https
Replace http with https on skins
2024-10-19 12:00:52 -07:00
Trial97
2030041fcc
Fix tests segfault
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 21:42:14 +03:00
seth
01721b593b
fix(flatpak): run tests for launcher
Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:40:15 -04:00
seth
0bae14999f
chore(flatpak): don't bundle JREs
After https://github.com/PrismLauncher/PrismLauncher/pull/2069, JREs can
be managed at runtime. This is great for the Flatpak, as previously
*all* JREs had to be installed and could not be updated independently of
the launcher's Flatpak. It also makes using unsupported Java versions
easier as the launcher can download any version in the sandbox

We don't need to include these anymore

Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:40:15 -04:00
seth
522d105dbe
fix(nix): enable checks
Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:32:36 -04:00
Trial97
7519c63f2e
Replace http with https on skins
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 01:11:27 +03:00
timoreo
f60d6e4d48
Merge pull request #2917 from Trial97/asan_log
fix heap-use-after-free in modrinth creation task
2024-10-18 12:09:24 +02:00