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

9434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Goode
8555ede5c4 Fix flatpak and nix workflows 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 a49a58bc45.

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
Seth Flynn
88109eaa71
ci: pin appimage tooling 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 5d5155bb22f9935e17e33008a644736404629928)
 2025-03-26 21:15:39 -04:00
Seth Flynn
1425c9801e
ci: use bundled linuxdeploy appimage plugin 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 6ef59fe984777e2620b445a78493afb86074eb8b)
 2025-03-26 21:15:39 -04:00
Evan Goode
808277d2f8 Bump to 9.2.4 2025-03-25 16:57:13 -04:00
Evan Goode
3ced5d6546 Support authlib-injector skin upload 2025-03-25 16:16:40 -04:00
Evan Goode
43cd5853c1 clang-format 2025-03-24 21:57:40 -04:00
Evan Goode
9116d373e7 Create authlib-injector account with punycoded URL 
Related: https://github.com/yushijinhun/authlib-injector/issues/270
 2025-03-24 20:20:36 -04:00
Alexandru Ionut Tripon
1a06e34fe4
[Backport release-9.x] Use correct colours for all system themes (#3539) 2025-03-24 19:25:27 +02:00
TheKodeToad
d0a77df703 Try best to avoid regression 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 513959750f23719b55030cd34b9a8f5b248289c5)
 2025-03-24 17:23:35 +00:00
TheKodeToad
57120e0c9d Use correct colours for all system themes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f08478c7ece0cd4e13b0bc188d0dcb9ea04c3199)
 2025-03-24 17:23:35 +00:00
Evan Goode
0e943b4bb1 Add back AuthlibInjectorMetadataStep 
Apparently this was forgotten during the 9.0 merging.
 2025-03-24 13:15:00 -04:00
Alexandru Ionut Tripon
57981a070f
[Backport release-9.x] Fix crash with low disk space (#3538) 2025-03-24 19:04:38 +02:00
Alexandru Ionut Tripon
be1a1baba4
[Backport release-9.x] fix account help link (#3537) 2025-03-24 19:04:25 +02:00
Trial97
9686a3c81c fix crash on accessing reseted output 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9ce5587f60d637d48bf20a8b9a40f020898710de)
 2025-03-24 17:03:13 +00:00
Trial97
b348114dee rename variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 269938dfd866df5918eb44779667142f7a157c22)
 2025-03-24 17:03:13 +00:00
Trial97
07604c9271 fix account help link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a4472406b96faabf2bdb78d152fc0e66bfe4ac63)
 2025-03-24 16:58:49 +00:00
Evan Goode
fde597aa0a Bump to 9.2.3 2025-03-23 20:27:57 -04:00
Evan Goode
84e9606e4f legacy: handle URL-encoded session ID 2025-03-23 19:38:16 -04:00
Evan Goode
d9ca7d2e74 legacy: rewrite http://session.minecraft.net/game/joinserver.jsp 2025-03-23 19:38:16 -04:00
Evan Goode
859ab72ea1 Update flake.lock 2025-03-23 15:25:49 -04:00
Alexandru Ionut Tripon
b49e9763bf
[Backport release-9.x] Fix crash with invalid quilt mod info (#3506) 2025-03-15 00:12:19 +02:00
Alexandru Ionut Tripon
b9d15a4781 Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 88bdb6541e3a57d6f84e75080dd6d24c1589a73d)
 2025-03-14 22:08:50 +00:00
Trial97
190d17acd3 Fix crash with invalid quilt mod info 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0626e354a026f9a2a35a4d6e28a0af105cb22986)
 2025-03-14 22:08:50 +00:00
Alexandru Ionut Tripon
5de91076ea
[Backport release-9.x] fix mod load with empty gameversions (#3490) 2025-03-10 14:41:07 +02:00
Trial97
299cbf8009 fix mod load with empty gameversions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 29b3eb5cc6fe3ba48a28598222212966bade1444)
 2025-03-10 12:40:50 +00:00