0O0o0oOoO00 171520adfb Merge remote-tracking branch 'LmeSzinc/master' into dev ...

# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/ui/ui.py

2025-06-28 23:09:47 +08:00

..

awaken

Upd: [JP][TW] Awaken assets

2025-01-19 03:19:28 +08:00

campaign

Merge branch 'master_lme'

2024-12-20 23:51:48 +08:00

coalition

Fix: assets for EN and JP

2025-06-27 22:18:08 +02:00

combat

Upd: asset COMBAT_AUTO

2025-01-26 21:49:34 +08:00

combat_ui

Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing

2025-04-21 12:35:05 +08:00

commission

upd: [JP] asset COMMISSION_START (#4353)

2024-12-09 12:44:54 +08:00

daily

Upd: [JP] asset OCR_REMAIN

2024-10-20 21:58:34 +08:00

device

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

dorm

upd: [JP] dorm assets

2024-10-16 12:48:21 +08:00

equipment

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

event

…

event_hospital

Upd: [JP] Hospital assets

2025-03-28 03:56:16 +08:00

exercise

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-10-25 12:01:29 +08:00

freebies

remove outdated EN -Mail assets, enable EN AUTO-Dossier (#4478)

2025-01-15 23:28:41 +08:00

gacha

Fix: Error caused by empty build queue (#2816)

2023-06-30 15:32:41 +08:00

guild

Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)

2025-02-12 01:53:08 +08:00

handler

Upd: [JP] USE_DATA_KEY (fixed #4344)

2024-11-22 22:22:07 +08:00

hard

…

map

Add: Switch mode in map preparation

2024-07-26 02:20:15 +08:00

meowfficer

Upd: [JP] Meowfficer assets (#3291)

2023-11-19 18:55:51 +08:00

meta_reward

Upd: [JP] SYNC_ENTER

2025-03-16 11:40:46 +08:00

minigame

Fix: enter minigame ended at minigame menu (#4758)

2025-05-19 01:48:29 +08:00

os

Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)

2022-10-04 00:25:42 -04:00

os_ash

Upd: [JP] ash_collect_status (#4554)

2025-02-03 22:53:24 +08:00

os_combat

…

os_handler

Upd: [JP] Opsi assets (#4492)

2025-01-06 18:31:52 +08:00

os_shop

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

raid

Add: [EN][JP] Assets in raid_20250416

2025-01-17 13:25:59 +08:00

research

Jp font 20241011 (#4272)

2024-10-12 14:29:01 +08:00

retire

tmp: [JP] asset DOCK_CHECK

2025-05-29 22:29:54 +08:00

reward

Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH

2025-05-20 23:55:12 +08:00

shipyard

Upd: Series selecting page in shipyard

2024-07-12 00:31:34 +08:00

shop

fix: shop confirm amount buttom (#3001)

2023-08-11 19:05:52 +08:00

sos

Fix: [EN] Confirm button in SOS signal search list

2022-12-07 01:38:57 +08:00

statistics

…

storage

Upd: [JP] BOX assets (#4814)

2025-05-21 23:44:58 +08:00

tactical

Chore: cleanup unused assets

2025-05-24 23:08:43 +08:00

template

Add: Chapter B

2025-02-27 23:03:27 +08:00

ui

Merge remote-tracking branch 'LmeSzinc/master' into dev

2025-06-28 23:09:47 +08:00

ui_white

Add: page_dock

2025-01-04 03:05:05 +08:00

war_archives

Opt: search archives entrance (#4284)

2024-10-16 12:50:23 +08:00