Zuosizhu 2bc586ce57 Merge branch 'master_lme' ...

# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py

2023-03-04 03:11:41 +08:00

..

base

Fix: crash in restart won't be handled.

2023-03-02 13:50:29 +08:00

campaign

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

combat

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

commission

update

2023-01-29 11:31:25 +08:00

config

Merge branch 'LmeSzinc:master' into master

2023-03-03 10:19:15 +08:00

daemon

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

daily

Fix: Missing offset on BATTLE_PREPARATION

2023-01-19 02:37:33 +08:00

device

Merge branch 'LmeSzinc:master' into master

2023-03-01 18:54:34 +08:00

dorm

Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS

2023-02-26 14:45:24 -05:00

equipment

Fix: Log word fix

2023-02-28 02:24:08 +08:00

event

…

exercise

第一次上传

2023-01-30 22:02:03 +08:00

freebies

Add: Option to delay buying weekly supply pack

2023-02-19 00:45:35 +08:00

gacha

Refactor: the way to call LogRes

2023-02-14 02:21:43 +08:00

game_setting

…

gg_handler

Fix: crash in restart won't be handled.

2023-03-02 13:50:29 +08:00

guild

Fix: Wrong attribute logged in _guild_logistics_collect()

2023-02-22 01:22:13 +08:00

handler

Add: Stop Alas or GemsFarming when auto search settings could not be set

2023-02-28 20:29:30 +08:00

hard

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

2023-02-18 01:19:04 +08:00

log_res

commit stashed for GG

2023-02-16 04:01:18 +08:00

map

Feature: Change flagship and vanguard in Event hard mode when GemsFarming

2023-02-24 18:37:14 +08:00

map_detection

Fix: Use the same edge_th in detect_edges() and generate()

2023-02-21 21:43:35 +08:00

meowfficer

Fix: Accidentally exit fort in meow_chores

2023-03-01 00:43:22 +08:00

meta_reward

Fix: inverse condition can exit prematurely without reward collect; change to image_color_count

2022-11-13 21:06:56 -05:00

ocr

Fix: [TW] SOS chapter 10 is OCRed as 0

2023-03-01 00:37:45 +08:00

os

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

os_ash

Merge branch 'LmeSzinc:master' into master

2023-02-22 10:10:52 +08:00

os_combat

Feature: Allow to use fleet mode in opsi

2023-02-12 02:02:01 +08:00

os_handler

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

raid

Fix: value log error

2023-02-14 08:10:18 +08:00

research

Fix: Catch game bug that the first research of queue is not running

2023-02-04 17:36:52 +08:00

retire

Merge branch 'master_lme'

2023-03-01 14:26:11 +08:00

reward

…

shipyard

Feature: Change flagship and vanguard in Event hard mode when GemsFarming

2023-02-24 18:37:14 +08:00

shop

Refactor: the way to call LogRes

2023-02-14 02:21:43 +08:00

sos

Fix: [TW] SOS chapter 10 is OCRed as 0

2023-03-01 00:37:45 +08:00

statistics

Fix: Handle thumb.db file when loading shop templates

2023-02-01 00:32:54 +08:00

storage

Fix: Use STORAGE_CHECK in _equipment_filter_enter()

2023-02-20 20:02:15 +08:00

submodule

Fix: Verify filename when adding new config

2022-11-05 04:17:14 +08:00

tactical

Fix: Catch empty skill slot in tactical

2023-02-04 17:27:24 +08:00

template

Add: Revelations of Dust chapter AC

2023-02-23 22:15:39 +08:00

ui

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

war_archives

Upd: [EN] war archive templates; allowing to war archive task to locate the event campaign

2023-02-26 14:45:47 -05:00

webui

Opt: Sequence of dashboard

2023-02-27 22:25:21 +08:00

exception.py

Add: Stop Alas or GemsFarming when auto search settings could not be set

2023-02-28 20:29:30 +08:00

logger.py

…

logger.pyi

Opt: Remove log output to stdout when using electron

2023-02-08 16:37:11 +08:00

notify.py

添加了类型判断，Onepush中某些中间件并不会返回Response而是返回NoneType(比如Discord)

2023-01-06 00:44:10 +08:00

server_checker.py

Fix: Ignore global proxy in server checker

2023-01-01 14:54:33 +08:00