9376 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
0d15699b26
change java on modpack update (#3379) 2025-04-29 08:31:59 +03:00
Alexandru Ionut Tripon
aa6324c920
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18 (#3704) 2025-04-29 08:31:46 +03:00
Alexandru Ionut Tripon
a6006c3a33
chore: make all the regexes static const (#3647) 2025-04-29 00:33:49 +03:00
renovate[bot]
1c223997db
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18 2025-04-28 21:33:12 +00:00
Alexandru Ionut Tripon
d6bba50d86
replace qvector with qlist (#3519) 2025-04-29 00:32:40 +03:00
Alexandru Ionut Tripon
5f20d98643
chore: update submodules (#3701) 2025-04-28 23:24:23 +03:00
Alexandru Ionut Tripon
25b1d79080
ci(nix): add github token for gh cli (#3700) 2025-04-28 22:49:38 +03:00
Trial97
c5fd5e6ac1
chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
Alexandru Ionut Tripon
21c90527d2
Parse log4j xml events in logs (#3642) 2025-04-28 18:33:17 +03:00
Alexandru Ionut Tripon
2ceb8a4986
Fix: Use after free collecting tasks from ResourceDownloadDialogs (#3670) 2025-04-28 18:32:39 +03:00
Trial97
0ccb4059a0
chore: update submodules
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 17:57:31 +03:00
Trial97
bcdbe79c59
fix: add github token for gh cli
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 17:38:01 +03:00
Rachel Powers
07a6606c9c
fix: cover both usages of the download dialog
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 04:49:30 -07:00
Rachel Powers
d0ccd110a1
fix: use after free begone!
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 04:49:23 -07:00
Rachel Powers
2031859731
Merge remote-tracking branch 'upstream/develop' into xml-logs 2025-04-28 04:11:53 -07:00
Rachel Powers
2c943a003d
feat(xml-logs): preserve whitespace lines in logs
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 03:54:47 -07:00
Rachel Powers
da30904630
fix: nullptr access (#3690) 2025-04-28 03:39:01 -07:00
TheKodeToad
63e30352e6
Fix catastrophic regex mistake (#3669) 2025-04-28 11:07:01 +01:00
TheKodeToad
51cd4c2174
Shallow search and lazy loading for Other Logs page (#3664) 2025-04-28 10:57:37 +01:00
TheKodeToad
1e3c197222
Merge remote-tracking branch 'upstream/develop' into shallow-lazy-otherlogs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:31:48 +01:00
TheKodeToad
20626e6606
Fix log sorting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:28:57 +01:00
TheKodeToad
0f7cb916cc
Pass mainclass and gameargs to the main game via system properties (#3692) 2025-04-28 09:47:25 +01:00
Alexandru Ionut Tripon
f58ee6af7a
ci(nix): fix get-merge-commit action call (#3697) 2025-04-27 23:48:49 +03:00
Rachel Powers
abba91c6fa
chore(deps): update determinatesystems/nix-installer-action action to v17 (#3686) 2025-04-27 13:46:57 -07:00
Seth Flynn
cdb4247323
Improve CI path filtering (#3696) 2025-04-27 14:48:09 -04:00
Seth Flynn
57a2ef1aed
ci: fix improper paths-ignore usage
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-04-27 07:47:36 -04:00
Seth Flynn
3b7b9fa03c
ci: better filter workflow runs
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-04-27 07:30:26 -04:00
Seth Flynn
47cb58d326
ci(nix): fix get-merge-commit action call
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-04-27 07:28:25 -04:00
Seth Flynn
440f7ea9a5
Use nix-shell over nix develop in .envrc (#3634) 2025-04-27 06:46:13 -04:00
Seth Flynn
816752e4e9
Ensure Nix workflows are actually running on PRs (#3678) 2025-04-27 03:21:58 -04:00
Xander
02106ab29a
comment on property about delimeter
Signed-off-by: Xander <xander@isxander.dev>
2025-04-26 23:42:22 +01:00
Xander
a92e114236
Use \u001F instead of a space as a delimeter for game args
Signed-off-by: Xander <xander@isxander.dev>
2025-04-26 21:57:28 +01:00
Xander
a702d06cd8
Pass mainclass and gameargs to the main game via system properties
Signed-off-by: Xander <xander@isxander.dev>
2025-04-26 21:41:14 +01:00
Seth Flynn
abe18fb144
ci(nix): checkout merge commit of pull request
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-04-26 15:02:39 -04:00
Rachel Powers
83ebb5984b
fix: nullptr access
style can't always be created

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-25 19:18:28 -07:00
renovate[bot]
f2a601f815
chore(deps): update determinatesystems/nix-installer-action action to v17 2025-04-24 16:58:13 +00:00
Seth Flynn
e03870d3f2
ci(get-merge-commit): init
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-04-20 16:52:14 -04:00
Alexandru Ionut Tripon
60e279bf39
chore(nix): update lockfile (#3672) 2025-04-20 08:29:12 +03:00
github-actions[bot]
3fd5557f89 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'libnbtplusplus':
    'github:PrismLauncher/libnbtplusplus/23b955121b8217c1c348a9ed2483167a6f3ff4ad?narHash=sha256-yy0q%2Bbky80LtK1GWzz7qpM%2BaAGrOqLuewbid8WT1ilk%3D' (2023-11-06)
  → 'github:PrismLauncher/libnbtplusplus/531449ba1c930c98e0bcf5d332b237a8566f9d78?narHash=sha256-qhmjaRkt%2BO7A%2Bgu6HjUkl7QzOEb4r8y8vWZMG2R/C6o%3D' (2025-04-16)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650?narHash=sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR%2BXhw3kr/3Xd0GPTM%3D' (2025-04-12)
  → 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
• Updated input 'qt-qrcodegenerator':
    'github:nayuki/QR-Code-generator/f40366c40d8d1956081f7ec643d240c02a81df52?narHash=sha256-5%2BiYwsbX8wjKZPCy7ENj5HCYgOqzeSNLs/YrX2Vc7CQ%3D' (2024-11-18)
  → 'github:nayuki/QR-Code-generator/2c9044de6b049ca25cb3cd1649ed7e27aa055138?narHash=sha256-6SugPt0lp1Gz7nV23FLmsmpfzgFItkSw7jpGftsDPWc%3D' (2025-01-23)
2025-04-20 00:28:02 +00:00
Rachel Powers
1bd1245d86
feat(xml-logs): Case insisitive xml parseing + cleaner switch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 13:48:18 -07:00
TheKodeToad
11015a22d2
Remove commented out code
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-19 13:02:40 -07:00
TheKodeToad
266031df81
Fix compilation on Qt 6.4.2
Is this an EOL version lol

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-19 13:02:40 -07:00
Rachel Powers
21570a03fb
feat(xml-logs): finish tests
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 13:02:30 -07:00
Rachel Powers
bfdc77665d
feat(xml-logs): add tests
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 12:54:45 -07:00
Rachel Powers
47295da390
feat(logs): parse log4j xml events in logs
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 12:54:40 -07:00
Rachel Powers
15a981b3f8
fix: gzip file parsing as a stream (#3667) 2025-04-19 05:33:56 -07:00
TheKodeToad
feec7bf249
chore: update submodules (#3643) 2025-04-19 11:08:34 +01:00
TheKodeToad
111cdc240e
Disable auto-reload of files
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-19 09:34:12 +01:00
Rachel Powers
2ce1fdcee0
chore(deps): update cachix/install-nix-action digest to 754537a (#3666) 2025-04-18 20:39:40 -07:00
Rachel Powers
16b0447dc9
blocked-prs workflow fixes (#3665) 2025-04-18 20:39:22 -07:00