Commit Graph

3 Commits

Author SHA1 Message Date
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
2020-06-13 03:29:35 +09:00
ferina8-14
9714b6bb1e Add: [JP] add jp assets, reward module 2020-06-13 02:53:29 +09:00
ferina8-14
f589ecfaa1 Add: [JP] add jp server support, copy assets from cn 2020-06-13 02:35:40 +09:00