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
..
campaign	Add: [JP] add jp assets, campaign module	2020-06-13 02:49:47 +09:00
combat	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
daemon	Add: [JP] add jp assets, daemon module	2020-06-13 02:50:35 +09:00
daily	Add: [JP] add jp assets, daily module	2020-06-13 02:50:51 +09:00
equipment	Add: [JP] add jp server support, copy assets from cn	2020-06-13 02:35:40 +09:00
exercise	Add: [JP] add jp assets, exercise module	2020-06-13 02:51:29 +09:00
handler	Add: [JP] add jp assets, handler module	2020-06-13 02:51:55 +09:00
hard	Add: [JP] add jp server support, copy assets from cn	2020-06-13 02:35:40 +09:00
map	Add: [JP] add jp assets, map module	2020-06-13 02:52:30 +09:00
retire	Add: [JP] add jp assets, retire module	2020-06-13 02:52:55 +09:00
reward	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
template	Add: [JP] add jp assets, template module	2020-06-13 02:53:45 +09:00
ui	Add: [JP] add jp assets, ui module	2020-06-13 02:54:19 +09:00