LmeSzinc e847f76256 Merge branch 'master' into dev ...

# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json

2022-10-28 03:09:41 +08:00

..

campaign

Add: TaskBalancer (#1509)

2022-08-24 23:44:49 +08:00

combat

Upd: AUTOMATION_CONFIRM

2022-08-20 23:28:15 +08:00

commission

Fix: [EN] Fix commission "flashing bug"

2022-04-14 13:22:25 -03:00

daily

Fix: [EN] fixed daily skip button

2022-04-15 05:19:36 -03:00

dorm

Upd: [EN] remove alpha channel in assets

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

equipment

Fix: Delete unused ui action; Rename button

2022-08-06 16:40:47 +08:00

event

Upd: [EN] remove alpha channel in assets

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

exercise

Upd: [EN] remove alpha channel in assets

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

freebies

Mov: re-factor relevant modules and assets into freebies

2022-10-19 21:04:43 -04:00

gacha

Fix: Wrong OCR result for build ticket count

2022-08-06 19:39:57 +08:00

guild

Fix: [EN] guild raid assets

2022-05-07 19:26:22 -04:00

handler

Upd: [EN] USE_DATA_KEY

2022-10-15 23:55:27 +08:00

hard

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

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

map

Upd: [EN] remove alpha channel in assets

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

meowfficer

Upd: [EN] MEOWFFICER_GET_CHECK from clipboard to share button; verified _check_popup_exit fix allows for consistent behavior for collection, screen shift and not

2022-06-22 22:38:28 -04:00

meta_reward

Add: [EN] meta_reward assets

2022-02-15 19:31:23 -05: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: [CN][EN] BEACON_LIST

2022-09-25 18:01:35 +08:00

os_combat

Upd: [EN] remove alpha channel in assets

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

os_handler

Upd: [EN] ASH_POPUP_CHECK

2022-10-14 12:25:05 +08:00

raid

Upd: [EN] ALBION raid assets

2022-10-28 02:54:09 +08:00

research

Fix: Cancel researches with unsatisfied requirements

2022-08-23 02:47:44 +08:00

retire

Add: [EN] asset support for ship scan (#1776)

2022-10-27 01:13:39 -04:00

reward

Mov: reward mail support to separate module

2022-10-16 01:01:15 -04:00

shipyard

Fix: PR5 support for series select grid

2022-07-15 06:59:55 -04:00

shop

Fix: x origin shop medal grid adjusted point maintenance

2022-07-23 12:36:41 -04:00

sos

Fix: [EN] increase loop attempts, account delay for GUI stability due to drag

2021-09-04 01:25:31 -04:00

statistics

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

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

storage

Add: [EN] storage assets

2022-09-01 21:07:41 -04:00

tactical

Fix: [EN] Unable to detect META skill list

2022-09-25 02:39:45 +08:00

template

Add: Siren templates in chapter BD

2022-09-16 22:06:13 +08:00

ui

Add: [EN] storage assets

2022-09-01 21:07:41 -04:00

war_archives

Add: [EN] ASHEN_SIMULCRUM search template for entrance

2022-07-23 12:27:13 -04:00