LA_DI_DA b0f8ca1143 Merge upstream ...

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

2024-05-16 19:58:51 +08:00

..

cn

Merge upstream

2024-05-16 19:58:51 +08:00

en

Merge upstream

2024-05-16 19:58:51 +08:00

gooey

…

gui

Merge branch 'LmeSzinc:master' into master

2023-10-29 07:00:48 +08:00

jp

Merge upstream

2024-05-16 19:58:51 +08:00

map_detection

Add: Moving in OS globe map

2021-04-03 21:59:58 +08:00

mask

Add: 15图开荒/周回 (#3563)

2024-04-19 01:29:17 +08:00

research_blueprint

Add: Blueprint assets of research S6 (#2872)

2023-07-13 23:02:25 +08:00

shop

Add: Medal Shop item SpecializedCore (#3637)

2024-04-13 23:42:53 +08:00

stats_basic

Add: reward module routine collect mail items; filter based on displayed icon

2022-10-08 16:56:39 -04:00

tw

Merge upstream

2024-05-16 19:58:51 +08:00