0a17cd6f5f
更新 static/webui/translations/zh.js
2025-07-06 21:37:37 -07:00
48f671978d
merge upstream
2025-07-06 21:33:17 -07:00
1545cdb8ce
fix(webui): handle config having no worldState entry at all ( #2427 )
...
Build Docker image / docker-amd64 (push) Successful in 47s
Build Docker image / docker-arm64 (push) Successful in 50s
Build / build (push) Successful in 1m13s
Reviewed-on: #2427
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:14:05 -07:00
80b5e2df7f
feat: random recessive traits for beasts ( #2426 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Reviewed-on: #2426
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:13:59 -07:00
76e61129bf
fix: skip birthdays of characters we can't talk to ( #2425 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Closes #2424
Reviewed-on: #2425
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:13:50 -07:00
ea3e299861
fix: ensure nightwave weekly challenges are unique ( #2423 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Re #2411
Reviewed-on: #2423
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:13:42 -07:00
3d8c1d036a
fix: ensure nightwave daily challenges are unique ( #2422 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
When generating a daily challenge, we now use sequentiallyUniqueRandomElement with a lookbehind of 2 to ensure the 2 previous (and still active) daily challenges are not duplicated.
Re #2411
Reviewed-on: #2422
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:13:32 -07:00
773f96ebbc
fix: set PrimeTokenAvailability to true ( #2420 )
...
Build / build (push) Has been cancelled
Build Docker image / docker-arm64 (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Closes #2416
Reviewed-on: #2420
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-06 20:13:20 -07:00
2a80307c26
chore(webui): reuse "code_remove" for "general_removeButton" ( #2421 )
...
Build Docker image / docker-arm64 (push) Successful in 50s
Build / build (push) Successful in 1m15s
Build Docker image / docker-amd64 (push) Successful in 51s
Closes #2418
Reviewed-on: #2421
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-05 20:18:18 -07:00
a40ff27fea
fix: add InitialStartDate to PrimeVaultTrader ( #2419 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Closes #2414
Reviewed-on: #2419
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-05 20:18:01 -07:00
3816d3612a
merge upstream
2025-07-05 17:45:40 -07:00
c9a4359714
chore(webui): update Chinese translation ( #2413 )
...
Build Docker image / docker-arm64 (push) Successful in 49s
Build / build (push) Successful in 51s
Build Docker image / docker-amd64 (push) Successful in 55s
Reviewed-on: #2413
Co-authored-by: Corvus <corvus@noreply.localhost>
Co-committed-by: Corvus <corvus@noreply.localhost>
2025-07-05 16:52:16 -07:00
658603b5fe
更新 static/webui/translations/zh.js
Build / build (pull_request) Successful in 53s
2025-07-05 07:50:27 -07:00
d81771d3ab
更新 static/webui/translations/zh.js
Build / build (pull_request) Successful in 53s
2025-07-05 07:44:44 -07:00
280ed8bef1
chore(webui): improve string ( #2412 )
...
Build / build (push) Successful in 53s
Build Docker image / docker-amd64 (push) Successful in 1m3s
Build Docker image / docker-arm64 (push) Successful in 48s
The `100% chance` part is unnecessary in practice and can be shortened. In-game it also never mentions the `100% chance` part either.
Reviewed-on: #2412
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-07-05 06:41:26 -07:00
9c89e907b1
chore(webui): update Chinese translation ( #2410 )
...
Build Docker image / docker-arm64 (push) Successful in 50s
Build / build (push) Successful in 54s
Build Docker image / docker-amd64 (push) Successful in 1m11s
Reviewed-on: #2410
Co-authored-by: Corvus <corvus@noreply.localhost>
Co-committed-by: Corvus <corvus@noreply.localhost>
2025-07-05 06:23:17 -07:00
b54fd96098
chore: fix cyclic includes due to saveConfig used in controllers ( #2409 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Reviewed-on: #2409
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-05 06:23:10 -07:00
c7c7fd4ea0
chore: enforce consistent imports ( #2408 )
...
Build Docker image / docker-amd64 (push) Successful in 47s
Build / build (push) Successful in 51s
Build Docker image / docker-arm64 (push) Successful in 47s
Reviewed-on: #2408
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 17:40:06 -07:00
a75e6d6b95
chore: add warning coverage for cyclic includes ( #2407 )
...
Build / build (push) Successful in 51s
Build Docker image / docker-amd64 (push) Successful in 52s
Build Docker image / docker-arm64 (push) Successful in 47s
and some initial refactoring to avoid it where possible
Reviewed-on: #2407
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 16:49:25 -07:00
5089f67146
chore: improve ship customization stuff ( #2402 )
...
Build / build (push) Successful in 47s
Build Docker image / docker-amd64 (push) Successful in 59s
Build Docker image / docker-arm64 (push) Successful in 49s
The only functionally relevant change is that orbiter scenes are now saved via SkinFlavourItem (as of U39?).
The rest is cleanup of the types because the ship customization stuff was duplicated all over the place.
Reviewed-on: #2402
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 15:19:15 -07:00
0416221d15
feat: reset custom obstable course leaderboard ( #2401 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Reviewed-on: #2401
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 15:19:03 -07:00
26729ce21a
feat: railjack skins ( #2400 )
...
Build Docker image / docker-amd64 (push) Waiting to run
Build Docker image / docker-arm64 (push) Has been cancelled
Build / build (push) Has been cancelled
Technically worked before but some weird behaviour. Also updating saveLoadout again. I think warn is a more appropriate severity. It's certainly not a progession stopper if some category is unimplemented.
Closes #2397
Reviewed-on: #2400
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 15:18:53 -07:00
ee4adc7d55
feat: Varzia (Prime Resurgence) rotation ( #2390 )
...
Build Docker image / docker-amd64 (push) Waiting to run
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Also closes #1059
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Reviewed-on: #2390
Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
2025-07-04 15:18:41 -07:00
29aadf4e78
chore(webui): improve string ( #2406 )
...
Build Docker image / docker-arm64 (push) Successful in 1m5s
Build Docker image / docker-amd64 (push) Successful in 59s
Build / build (push) Successful in 1m34s
other `after Hacking` or `while Hacking` strings are in uppercase, but this particular one wasn't
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Reviewed-on: #2406
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-07-04 15:02:30 -07:00
0b32bc21be
chore(webui): improve string ( #2405 )
...
Build / build (push) Successful in 46s
Build Docker image / docker-arm64 (push) Successful in 1m5s
Build Docker image / docker-amd64 (push) Successful in 1m8s
was missing a plus and this shorter version may fit better
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Reviewed-on: #2405
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>
2025-07-04 04:55:36 -07:00
e09e5ebec2
fix: infinite loop when attempting to generate loid commisions ( #2399 )
...
Build / build (push) Successful in 1m2s
Build Docker image / docker-amd64 (push) Successful in 1m17s
Build Docker image / docker-arm64 (push) Successful in 1m4s
Reviewed-on: #2399
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-04 03:26:41 -07:00
b2de8608c6
chore: fix duplicate import
Build Docker image / docker-arm64 (push) Successful in 1m2s
Build Docker image / docker-amd64 (push) Successful in 56s
Build / build (push) Successful in 1m20s
2025-07-04 11:46:49 +02:00
2b23db1433
chore: remove usage of markModified ( #2403 )
...
Build Docker image / docker-arm64 (push) Successful in 1m4s
Build / build (push) Successful in 1m19s
Build Docker image / docker-amd64 (push) Successful in 56s
Only this one remained, but not needed because it's schema'd.
Reviewed-on: #2403
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-03 22:45:07 -07:00
a45bacc388
chore: update PE+ ( #2398 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Closes #2392
Reviewed-on: #2398
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-03 22:44:26 -07:00
46d37d3688
chore(webui): update Chinese translation ( #2396 )
...
Build Docker image / docker-arm64 (push) Successful in 1m3s
Build Docker image / docker-amd64 (push) Successful in 53s
Build / build (push) Successful in 1m23s
Reviewed-on: #2396
Co-authored-by: Corvus <corvus@noreply.localhost>
Co-committed-by: Corvus <corvus@noreply.localhost>
2025-07-03 11:09:07 -07:00
41686aea88
fix: properly cap negative syndicate standing ( #2393 )
...
Build Docker image / docker-arm64 (push) Waiting to run
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Closes #2388
Reviewed-on: #2393
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-03 11:08:57 -07:00
61ac2f8b72
chore(webui): update Chinese translation ( #2394 )
...
Build Docker image / docker-arm64 (push) Successful in 1m1s
Build / build (push) Successful in 56s
Build Docker image / docker-amd64 (push) Successful in 1m18s
Reviewed-on: #2394
Co-authored-by: Corvus <corvus@noreply.localhost>
Co-committed-by: Corvus <corvus@noreply.localhost>
2025-07-02 15:04:42 -07:00
d2ab894c01
fix(webui): assign labels for appropriate inputs ( #2391 )
...
Build / build (push) Successful in 1m1s
Build Docker image / docker-amd64 (push) Successful in 1m12s
Build Docker image / docker-arm64 (push) Successful in 1m3s
Reviewed-on: #2391
Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
2025-07-02 14:29:41 -07:00
8c85cdcd1d
feat(webui): "add maxed" for mods ( #2387 )
...
Build / build (push) Successful in 1m0s
Build Docker image / docker-amd64 (push) Successful in 50s
Build Docker image / docker-arm64 (push) Successful in 1m0s
Closes #2382
Reviewed-on: #2387
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-02 14:18:24 -07:00
aa6191f033
feat: relic rng cheats ( #2386 )
...
Build Docker image / docker-amd64 (push) Successful in 48s
Build Docker image / docker-arm64 (push) Successful in 1m3s
Build / build (push) Has been cancelled
Closes #2370
Reviewed-on: #2386
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-02 14:17:14 -07:00
e26d2635fb
chore(webui): fix inconsistent % chance strings ( #2385 )
...
Build / build (push) Successful in 1m0s
Build Docker image / docker-amd64 (push) Successful in 1m8s
Build Docker image / docker-arm64 (push) Has been cancelled
Closes #2381
Reviewed-on: #2385
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-02 14:15:50 -07:00
dd6ae8898f
chore(webui): move max rank button before detailed view link ( #2384 )
...
Reviewed-on: #2384
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-02 14:14:19 -07:00
499ca23ffb
chore(webui): update inventory when equipment was forma'd ( #2383 )
...
Build / build (push) Successful in 48s
Build Docker image / docker-arm64 (push) Successful in 1m5s
Build Docker image / docker-amd64 (push) Successful in 1m12s
Reviewed-on: #2383
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-02 14:14:13 -07:00
d3102acb7c
chore(webui): update Chinese translation ( #2380 )
...
Build Docker image / docker-arm64 (push) Successful in 1m3s
Build / build (push) Successful in 58s
Build Docker image / docker-amd64 (push) Successful in 1m8s
Reviewed-on: #2380
Co-authored-by: Corvus <corvus@noreply.localhost>
Co-committed-by: Corvus <corvus@noreply.localhost>
2025-07-01 10:58:47 -07:00
363028c9ce
chore: clarify log output related to saveLoadout ( #2379 )
...
Build / build (push) Successful in 58s
Build Docker image / docker-amd64 (push) Successful in 49s
Build Docker image / docker-arm64 (push) Successful in 1m2s
Reviewed-on: #2379
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:48:03 -07:00
1d60745f18
feat: year rollover kiss emails ( #2376 )
...
Build / build (push) Successful in 1m16s
Build Docker image / docker-arm64 (push) Successful in 1m2s
Build Docker image / docker-amd64 (push) Successful in 52s
Closes #2375
Reviewed-on: #2376
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:45:41 -07:00
a9b3b16d31
feat: dojo visitors ( #2374 )
...
Build Docker image / docker-arm64 (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Closes #2373
Reviewed-on: #2374
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:45:12 -07:00
fd1d72a1cf
chore(webui): add inventory update note to quests tab ( #2372 )
...
Build Docker image / docker-amd64 (push) Waiting to run
Build Docker image / docker-arm64 (push) Waiting to run
Build / build (push) Has been cancelled
Reviewed-on: #2372
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:44:30 -07:00
75832afdbe
feat: relicRewardItemCountMultiplier cheat ( #2369 )
...
Build Docker image / docker-arm64 (push) Has been cancelled
Build / build (push) Has been cancelled
Build Docker image / docker-amd64 (push) Has been cancelled
Reviewed-on: #2369
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:44:13 -07:00
aa916d2820
feat: sell genetic imprints ( #2368 )
...
Build Docker image / docker-amd64 (push) Has been cancelled
Build / build (push) Has been cancelled
Build Docker image / docker-arm64 (push) Has been cancelled
Reviewed-on: #2368
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-07-01 07:44:05 -07:00
5a5f6106a3
chore: save inventory and account in parallel when claiming login reward ( #2371 )
...
Build / build (push) Successful in 47s
Build Docker image / docker-arm64 (push) Successful in 1m1s
Build Docker image / docker-amd64 (push) Successful in 1m6s
Reviewed-on: #2371
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-06-30 17:55:06 -07:00
24d9dc27e2
chore(webui): update inventory when login reward was claimed ( #2367 )
...
Build / build (push) Successful in 48s
Build Docker image / docker-arm64 (push) Successful in 1m1s
Build Docker image / docker-amd64 (push) Successful in 1m11s
Closes #2360
Reviewed-on: #2367
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-06-30 13:30:09 -07:00
5e05a15743
fix: update calendar progress at daily reset ( #2365 )
...
Build / build (push) Successful in 58s
Build Docker image / docker-amd64 (push) Successful in 48s
Build Docker image / docker-arm64 (push) Successful in 1m1s
Closes #2364
Reviewed-on: #2365
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-06-30 13:28:27 -07:00
545b949202
feat: sell crew members ( #2366 )
...
Build / build (push) Successful in 55s
Build Docker image / docker-arm64 (push) Successful in 1m9s
Build Docker image / docker-amd64 (push) Successful in 1m10s
Closes #2363
Reviewed-on: #2366
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-06-30 12:58:24 -07:00
0c9b27a29b
chore: optimise creditsController ( #2359 )
...
Build / build (push) Successful in 1m1s
Build Docker image / docker-arm64 (push) Successful in 1m3s
Build Docker image / docker-amd64 (push) Successful in 1m21s
Doing both lookups in parallel saves around 1 ms in the happy case (20% of baseline time), and in case nonce does not match, the error is simply raised as per usual with the inventory request being lightweight enough to be negligible.
Noteworthy that this reasoning doesn't really work for other controllers because in the error case, the inventory request would still be quite significant, even if the HTTP request itself would still finish quickly.
Reviewed-on: #2359
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-06-30 11:05:49 -07:00
