LmeSzinc 0ad1daf412 Merge branch 'master' into app ...

# Conflicts:
#	module/config/config.py
#	module/reward/reward.py

2021-10-02 18:06:22 +08:00

..

cn

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00

en

Merge branch 'master' into app

2021-10-02 18:06:22 +08:00

gooey

…

jp

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00

map_detection

Add: Moving in OS globe map

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

mask

Fix: Akashi detection in OS radar (#502)

2021-06-29 16:44:09 +08:00

research_blueprint

Upd: blueprint marcopolo asset

2021-07-14 15:10:54 +08:00

shop

Opt: Remove all s from item name to avoid typo and mis-understandings

2021-09-25 12:17:00 +08:00

stats_basic

Opt: Remove all s from item name to avoid typo and mis-understandings

2021-09-25 12:17:00 +08:00

tw

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00