AstralTransRocketries/FjordLauncher
1
0
Fork 0
mirror of https://github.com/unmojang/FjordLauncher.git synced 2025-08-03 10:16:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,458 Commits 14 Branches 54 Tags
Commit Graph

9458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cat
6d01093575 Add betacraft skin server support for legacy online fixes 
Signed-off-by: cat <cat@plan9.rocks>
 2025-06-18 18:51:01 -04:00
lily celeste newton
ae5541a3fd "discord" -> "Discord server" 
Signed-off-by: Liliana Newton <tauon_the_proto@protonmail.com>
 2025-05-16 17:38:40 -04:00
lily celeste newton
a053c2c6d5 be more respectful in the readme file 
Signed-off-by: Liliana Newton <tauon_the_proto@protonmail.com>
 2025-05-16 17:38:40 -04:00
Evan Goode
55572112d1 deprecate ubuntu 20.04 runner 9.4.0 2025-04-19 22:25:20 -04:00
Evan Goode
b2453e207c fix cachix name 2025-04-19 21:45:46 -04:00
Evan Goode
2ac10d317d Fix nix version 2025-04-15 22:59:56 -04:00
Evan Goode
833b9b8a6d Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-04-15 22:30:13 -04:00
Seth Flynn
385bb500b9
revert: "ci: use ninja with msvc on x64" (#3600) 2025-04-07 12:15:28 -04:00
Seth Flynn
39a7021419
revert: "ci: use ninja with msvc on x64" 
Ninja doesn't work in release mode. We need that

Refs: be2d144
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-04-07 11:49:24 -04:00
Seth Flynn
6067ef1d86
chore: bump to 9.4 (#3598) 2025-04-07 11:11:19 -04:00
Seth Flynn
5598b6b12e
chore: bump to 9.4 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-04-07 10:46:44 -04:00
Seth Flynn
98ae412305
Fix compatibility with macOS 11 (#3595) 2025-04-07 10:06:18 -04:00
Seth Flynn
de78947fec
[Backport release-9.x] Use ninja with MSVC on x64 (#3597) 2025-04-07 09:49:23 -04:00
Seth Flynn
084dcd4e77
[Backport release-9.x] Fix Nix release CI (#3596) 2025-04-07 09:42:07 -04:00
Seth Flynn
879495942a
revert: "feat: publish on flakehub" 
Flakehub requires semver. We don't use that (yet)

Refs: 86cc6d3
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 6386d044e3fc5ec056479e508ade4da993a81cd4)
 2025-04-07 09:33:38 -04:00
Seth Flynn
f7dbdb79be
ci(nix): pin release packages in cachix 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 180292098d9c4ad87ed0d9babed92e152feb5475)
 2025-04-07 09:33:37 -04:00
Seth Flynn
71dc114a09
ci(nix): correctly parse action env vars as bools 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 76bec385d6803e94899028695226d872185b3d39)
 2025-04-07 09:33:37 -04:00
Seth Flynn
1e201beb41
ci(nix): ignore more paths 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 1a5a162727c7d9d91aefd3852c127d60179844ae)
 2025-04-07 09:33:37 -04:00
Seth Flynn
feefeecea9
ci(nix): run on tags 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit da3a4984909b4b1d801018bf80eb93feadc97100)
 2025-04-07 09:33:37 -04:00
Seth Flynn
be2d144b40
ci: use ninja with msvc on x64 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit d92f7b3c9710679550111037fb7e41fe64443927)
 2025-04-07 09:29:33 -04:00
Seth Flynn
8fe7975ab8
revert: downgrade macos builds to qt 6.7.3 
Fixes: https://github.com/PrismLauncher/PrismLauncher/issues/3592
Refs: https://github.com/PrismLauncher/PrismLauncher/pull/2895
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-04-07 09:10:09 -04:00
Alexandru Ionut Tripon
e7eada9002
[Backport release-9.x] chore(nix): update lockfile (#3593) 2025-04-07 15:15:48 +03:00
github-actions[bot]
dc799cf87b chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5e5402ecbcb27af32284d4a62553c019a3a49ea6?narHash=sha256-gWd4urRoLRe8GLVC/3rYRae1h%2BxfQzt09xOfb0PaHSk%3D' (2025-03-27)
  → 'github:NixOS/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434?narHash=sha256-F7n4%2BKOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE%3D' (2025-04-02)

(cherry picked from commit aec410cb28bb844f3e3bc0e1a2040a90baf09b71)
 2025-04-07 12:13:15 +00:00
Evan Goode
8a5aee6494 Delete publish workflow 2025-04-06 20:55:46 -04:00
Evan Goode
8555ede5c4 Fix flatpak and nix workflows 9.3.0 2025-04-06 18:30:54 -04:00
Evan Goode
35131193dd Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:23:05 -04:00
Seth Flynn
ce0a730531
[Backport release-9.x] Use default palette on all system themes (#3585) 2025-04-06 15:57:45 -04:00
Seth Flynn
f00226f797 fix(SystemTheme): use default palette on all system themes 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e5861129ad58a8b5cdf55ed69bb9a7ce92811b87)
 2025-04-06 19:55:13 +00:00
Seth Flynn
a96a915d79
[Backport release-9.x] Nix Flake spring cleaning (#3576) 2025-04-04 15:04:53 -04:00
Seth Flynn
83f79c93f8
chore(nix): set stable version 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-04-04 05:24:38 -04:00
Seth Flynn
b228800de1
chore(gitignore): add more nix-related files 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit de08d7c3644e96a3694f232b53c81f53c40c077a)
 2025-04-04 05:07:19 -04:00
Seth Flynn
e8bdc72476
refactor(nix): use date for version 
Helps avoid needless rebuilds where only the revision changed. Also
better conforms to Nixpkgs' version standards

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e9cac2e0e37c4531f662545bdc45b72499654642)
 2025-04-04 05:07:19 -04:00
Seth Flynn
da9c359184
chore(nix): clone git submodules automatically 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 9b38226f8cb0e2f82bcb017c686fd03520990dd1)
 2025-04-04 05:07:19 -04:00
Seth Flynn
b02718ee57
chore(nix): add nice welcome message to dev shell 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 38ec7def324891c5062d9b58c1180d44494f91d1)
 2025-04-04 05:07:19 -04:00
Seth Flynn
ddcd61c808
refactor(nix): rely more on setup hooks in dev shell 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit de923a07d8a4b7c9f8cd688b9682587c78116e14)
 2025-04-04 05:07:18 -04:00
Seth Flynn
760fbdf54f
build(nix): properly wrap development shell 
Allows actually running the executables built in the development shell

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 2d4bc09cb9bec621997e00c23acac0b7cf3e99d7)
 2025-04-04 05:07:18 -04:00
Seth Flynn
5c4bd3db52
fix(nix): only create compile_commands.json if it doesn't exist 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 58579539d071c569800ba0370a6d5918de025e33)
 2025-04-04 05:07:18 -04:00
Seth Flynn
87c5b6cc83
refactor(nix): cleanup flake 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 32b49ecb84da5683bce42e2e888319f4517f1d53)
 2025-04-04 05:07:16 -04:00
Seth Flynn
80ff62c96d
refactor(nix): pin flake-compat in default.nix 
Avoids polluting downstream flake.locks

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit c367f48ec99f048f8d4bcaf0634370be33b29c62)
 2025-04-04 05:06:05 -04:00
Seth Flynn
b5fc23952e
Reapply "refactor(nix): nix-filter -> lib.fileset" 
After extensive (5 minutes) of testing, it seems we don't actually come
across any Nix bugs with lib.fileset! (aside from those inherit to
it...but 🤷)

This reverts commit a49a58bc4571f87f42f45bb9eeb1a957d5d12331.

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 99852c972c6e9fc6a8caca727946a71a85c1672f)
 2025-04-04 05:06:01 -04:00
Alexandru Ionut Tripon
5c8ef3a003
[Backport release-9.x] feat: add updater dialogues (#3568) 2025-04-01 18:31:09 +03:00
Sticks
b0ee4f6e58 fix: remove qWarning for unknown state 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit d4e1851e6779d99e3ffde79c7e4e8edb568415ce)
 2025-04-01 15:10:15 +00:00
Sticks
25ce20a877 fix: Grammar correction in failed message for update dialogues 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sticks <sticks@teamhydra.dev>
(cherry picked from commit ea5458ed2253a4e8a9ef50d076fe72c57d2cb669)
 2025-04-01 15:10:15 +00:00
sticks
2952b1d6b6 feat: add updater dialogues 
Signed-off-by: sticks <tanner@teamhydra.dev>
(cherry picked from commit 998bc660fa97f4527443dd826eede5e8eab23651)
 2025-04-01 15:10:15 +00:00
Alexandru Ionut Tripon
416495cda7
[Backport release-9.x] Fix typo in NetRequest.cpp (#3562) 2025-03-31 08:20:18 +03:00
LAHarbottle
6de8ed91a3 Fix typo in NetRequest.cpp 
Signed-off-by: LAHarbottle <87842870+LAHarbottle@users.noreply.github.com>
(cherry picked from commit 66c6399adedcb52c2b7391cdbf38602f8b2814a6)
 2025-03-31 05:13:04 +00:00
Alexandru Ionut Tripon
f9ab98f2cf
[Backport release-9.x] fix themes leak (#3556) 2025-03-30 01:55:52 +02:00
Trial97
fcc1e80237 fix themes leak 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5b12d3cfff9092c0364e455c211fc189d87039cd)
 2025-03-29 23:55:27 +00:00
Alexandru Ionut Tripon
1a56396e2e
[Backport release-9.x] Pin AppImage tooling in CI, drop libfuse2 (#3551) 2025-03-27 09:51:49 +02:00
Seth Flynn
0f21e01b46
ci: don't install libfuse2 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 671aad88f52e3fbba872e80f2805c0c5c64b7a8d)
 2025-03-26 21:15:39 -04:00