LA_DI_DA 85e4f8e15e Merge branch 'refs/heads/lme-alas/master' into smallkai ...

# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py

2024-05-17 18:38:32 +08:00

..

base

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

campaign

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-04-27 15:56:34 +08:00

coalition

Merge branch 'master_lme'

2023-10-20 01:01:54 +08:00

combat

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

commission

Fix: [TW] OCR error on commission name

2024-05-03 16:49:11 +08:00

config

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

daemon

Merge branch 'master_lme'

2024-04-10 12:22:40 +08:00

daily

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

device

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

dorm

Fix: Chain call minitouch in dorm

2024-04-15 19:20:52 +08:00

equipment

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

event

…

exercise

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

freebies

Upd: Assets for entering supply pack

2023-07-14 00:31:52 +08:00

gacha

Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9)

2024-04-13 11:54:12 +08:00

game_setting

…

gg_handler

Fix: gg ui display incomplete

2024-01-12 12:19:04 +08:00

guild

Opt: Remove meaningless sleep from stone age

2024-04-20 02:50:12 +08:00

handler

Merge branch 'master_lme_to_merge'

2024-04-27 13:00:39 +08:00

hard

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

log_res

…

map

Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai

2024-05-17 18:09:32 +08:00

map_detection

Fix: relative_hsv_count was counting pixels in 3 channels

2024-05-02 16:47:11 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING

2023-09-28 16:26:20 +08:00

notify

Opt: [ALAS] Lazy import onepush

2024-04-28 17:12:03 +08:00

ocr

Fix: Add atomic OCR method on client side

2024-05-09 18:51:52 +08:00

os

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

os_ash

Fix: Ash power limit not safe enough

2023-12-28 01:19:55 +08:00

os_combat

Merge branch 'lme-alas/master' into smallkai

2023-10-19 23:00:39 +08:00

os_handler

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-04-27 15:56:34 +08:00

raid

Merge branch 'LmeSzinc:master' into 20230309

2024-03-29 07:09:29 +08:00

research

Upd:[TW]research assets (#3721)

2024-05-03 14:49:42 +08:00

retire

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

reward

Fix: _reward_mission_collect() calls should have minimum interval

2024-04-29 00:45:40 +08:00

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Merge branch 'refs/heads/lme-alas/master' into smallkai

2024-05-17 18:38:32 +08:00

sos

Del: [CN][EN][JP] Disable SOS task

2023-06-08 16:49:57 +08:00

statistics

Fix: Limit text length when logging upload errors (#3242)

2023-11-01 01:48:42 +08:00

storage

Add: Siren templates in chapter A

2023-08-18 22:29:25 +08:00

submodule

Opt: No raw command textarea in FpyBenchmark

2023-05-09 14:40:24 +08:00

tactical

Merge branch '20230309' into smallkai

2024-04-11 22:12:34 +08:00

template

Fix: Duplicated SheffieldIdol template

2024-04-26 04:01:06 +08:00

ui

Merge branch 'dev-revert-gemsfarming'

2024-04-20 15:16:09 +08:00

war_archives

Add: War Archives The Way Home in the Night

2024-03-11 22:57:37 +08:00

webui

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-04-27 15:56:34 +08:00

exception.py

…

logger.py

Sync: [SRC] Sync alas changes

2023-09-10 15:04:32 +08:00

logger.pyi

…

server_checker.py

…