LmeSzinc 32e065ad9c Merge branch 'master' into bug_fix ...

# Conflicts:
#	module/os_handler/strategic.py

2022-12-18 17:13:44 +08:00

..

base

…

campaign

Add: [EN] asset update for strategic search (#1948)

2022-12-11 23:53:52 -05:00

combat

Merge branch 'master' into dev

2022-12-07 01:50:32 +08:00

commission

Fix: Fix several error in commission preset filter

2022-12-01 10:52:17 +08:00

config

Upd: opsi_task_delay; Opsi archive supports submarine calls

2022-12-11 23:57:14 -05:00

daemon

…

daily

…

device

Opt: Retry black screenshots at startup

2022-12-07 20:13:55 +08:00

dorm

Fix: Limit dorm loves and coins to 6

2022-11-28 00:02:04 +08:00

equipment

Upd: [EN] EQUIP_CONFIRM in equipment module

2022-12-12 18:00:44 +08:00

event

…

exercise

Fix: Double clicked BATTLE_PREPARATION in exercise

2022-12-07 12:59:33 +08:00

freebies

Upd: [TW] Mail collect (#1975)

2022-12-11 13:47:37 +08:00

gacha

…

game_setting

…

guild

…

handler

Fix: Wrong statement in submarine hunt (#1957)

2022-12-08 00:04:18 +08:00

hard

…

map

Fix: Missing hunt_and_boss use in Fleet._goto()

2022-12-08 01:27:30 +08:00

map_detection

…

meowfficer

…

meta_reward

…

ocr

Opt: Less RAM use in app.py by not importing numpy and zerorpc

2022-12-16 22:24:32 +08:00

os

Fix: [EN] Update FLEET_* in OpSi

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

os_ash

Fix: Different interval of BATTLE_PREPARATION in ash attack (#2005)

2022-12-16 22:55:01 +08:00

os_combat

…

os_handler

Merge branch 'master' into bug_fix

2022-12-18 17:13:44 +08:00

raid

Fix: Oil limit too low

2022-11-29 21:15:51 +08:00

research

Add: Frame of preset commission filter

2022-12-01 10:51:41 +08:00

retire

Fix: [EN] Temp fix on dock_selected, EN has no selected info in dock

2022-12-10 23:28:32 +08:00

reward

…

shipyard

…

shop

Merge pull request #1992 from LmeSzinc/bug_fix

2022-12-12 00:04:34 +08:00

sos

Fix: Find TEMPLATE_SIGNAL_CONFIRM in SOS chapter list

2022-12-07 12:59:12 +08:00

statistics

Opt: Log CL1 time cost

2022-12-07 12:26:18 +08:00

storage

Opt: Add trace log when switching storage tabs

2022-12-10 23:06:31 +08:00

submodule

…

tactical

Fix: Loop clicking between RAPID_TRAINING and ADD_NEW_STUDENT

2022-12-07 01:30:19 +08:00

template

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

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

ui

Fix: Subtracting None in NavBar.get_total()

2022-12-15 01:52:07 +08:00

war_archives

Add new wararchives 20221117

2022-11-22 11:10:17 +08:00

webui

Opt: Less pre-loads in gui.py by not importing config_updater

2022-12-16 22:15:32 +08:00

exception.py

…

logger.py

…

logger.pyi

…

notify.py

…

server_checker.py

Fix: Regard all exception as failure

2022-12-09 18:46:48 +08:00