SarContDeli 9f47f247de Merge remote-tracking branch 'origin/dev' into fleetorder ...

# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/override.yaml

2022-04-23 15:42:40 +08:00

..

base

Fix: Increase threshold of GUILD_DISPATCH_FLEET_UNFILLED and GUILD_DISPATCH_FLEET, they are transparent now (#1031)

2022-04-19 21:35:26 +08:00

battle_pass

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

campaign

Opt: Remove 7-2 mystery farming, 12-2 leveling, 12-4 leveling; add multiple Main and Event tasks

2022-04-23 14:36:52 +08:00

combat

Opt: AutoSearchFleetOrder is merged into FleetOrder

2022-04-23 14:11:00 +08:00

commission

Fix: Invalid commission duration because of info_bar (#890)

2022-04-19 20:21:28 +08:00

config

Merge remote-tracking branch 'origin/dev' into fleetorder

2022-04-23 15:42:40 +08:00

daemon

Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown

2022-04-19 01:00:07 +08:00

daily

Fix: [EN] fixed daily skip button

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

data_key

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

device

Add: [TW] MyCard channel server com.hkmanjuu.azurlane.gp.mc

2022-04-20 00:05:50 +08:00

dorm

Fix: [EN] Fix Tactical Class and Dorm Feature.

2022-04-12 13:21:08 -03:00

equipment

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

event

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

exercise

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

gacha

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

guild

Fix: Increase threshold of GUILD_DISPATCH_FLEET_UNFILLED and GUILD_DISPATCH_FLEET, they are transparent now (#1031)

2022-04-19 21:35:26 +08:00

handler

Opt: AutoSearchFleetOrder is merged into FleetOrder

2022-04-23 14:11:00 +08:00

hard

Opt: AutoSearchFleetOrder is merged into FleetOrder

2022-04-23 14:11:00 +08:00

map

Opt: AutoSearchFleetOrder is merged into FleetOrder

2022-04-23 14:11:00 +08:00

map_detection

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

meowfficer

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

meta_reward

Upd: [JP] assets for meta reward

2022-03-07 11:57:58 +08:00

ocr

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

os

Fix: Click on MAP_GOTO_GLOBE in os_mission_enter()

2022-04-23 12:39:05 +08:00

os_ash

Upd: [EN] LOGIN_GAME_UPDATE, BATTLE_STATUS; text size/thickness changed

2022-04-15 14:35:31 -04:00

os_combat

change CRLF to LF

2022-04-09 23:31:09 +08:00

os_handler

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

raid

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

research

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

retire

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

reward

change CRLF to LF

2022-04-09 23:31:09 +08:00

shipyard

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

shop

Opt: Improve log appearance in shop module

2022-04-18 00:43:44 +08:00

sos

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

statistics

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

supply_pack

change CRLF to LF

2022-04-09 23:31:09 +08:00

tactical

Opt: Faster tactical class clicking

2022-04-19 21:50:29 +08:00

template

Add: Aurora Noctis map files

2022-04-14 19:56:13 +08:00

ui

Fix: Handle popups after exiting from page_tactical to page_reward (#1018)

2022-04-17 19:52:21 +08:00

war_archives

Opt: Imports isorted

2022-04-14 16:37:54 -03:00

webui

Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown

2022-04-19 01:00:07 +08:00

exception.py

Fix: Confirm unknown ui page; 5 seconds timeout (#956)

2022-03-07 22:18:10 +08:00

logger.py

Opt: Minor changes for log appearances

2022-01-24 23:15:50 +08:00