Zuosizhu b8d12c405f Merge branch 'master_lme' into brocore_dev ...

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

2025-07-25 11:46:23 +08:00

..

awaken

Upd: [EN] Awaken assets

2025-01-05 03:15:51 +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

Merge branch 'master_lme' into brocore_dev

2025-07-25 11:46:23 +08:00

combat_ui

Upd: [EN] QUIT_Christmas

2024-12-27 21:28:06 +08:00

commission

Upd: [EN][JP] Assets in page_reward

2024-05-22 01:15:18 +08:00

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +08:00

dorm

Add: Quick collection of coins and loves in the Dorm. (#3837)

2024-07-03 22:27:22 +08:00

equipment

fix: Adapt to new APIs from upstream

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

event

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04:00

event_hospital

Upd: [EN] use the "vesti" word as TEMPLATE_INVEST

2025-03-29 01:01:41 +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

Fix: assets for EN and JP

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

handler

Fix: Emulator no respond (#4947)

2025-07-17 22:44:28 +08:00

hard

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

map

Add: Switch mode in map preparation

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

meowfficer

Upd: [EN] MEOWFFICER_BUY_ENTER

2025-01-04 21:21:35 +08:00

meta_reward

Merge pull request #4866 from dragonheart107/assets

2025-06-10 17:56:24 +08:00

minigame

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

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

os

Fix: [EN] Update FLEET_* in OpSi

2022-12-16 21:42:36 +08:00

os_ash

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

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

os_combat

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04:00

os_handler

Fix: current ap blocked by info bar (#4100)

2024-08-20 02:25:44 +08:00

os_shop

Feature: New OpsiShop. (#3086)

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

private_quarters

Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact

2025-06-15 17:09:52 -04:00

raid

Add: [EN][JP] Assets in raid_20250416

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

research

Upd: Detect research series 7

2024-07-12 00:07:25 +08:00

retire

Upd: [EN] DOCK_SELECTED (#4850)

2025-05-30 22:09:46 +08:00

reward

Chore: cleanup unused assets

2025-05-24 23:08:43 +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

Fix: [EN] redo statistics assets; not all black except for target

2021-12-03 17:05:41 -05:00

storage

Upd: [EN] BOX assets

2025-05-21 02:52:39 +08:00

tactical

Fix: Trying to handle books empty (#3753)

2024-06-11 23:38:43 +08:00

template

Add: Chapter T

2025-07-24 23:35:47 +08:00

ui

Merge branch 'master_lme' into brocore_dev

2025-07-11 23:03:05 +08:00

ui_white

Add: page_dock

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

war_archives

Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets

2025-05-24 23:12:01 +08:00