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
..
base	Fix: Re-check all timeout timer	2020-06-03 05:06:51 +08:00
campaign	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
combat	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
config	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
daemon	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
daily	Add: [JP] add jp assets, daily module	2020-06-13 02:50:51 +09:00
device	Optimize: Faster screen size check	2020-05-31 03:33:51 +08:00
equipment	Add: [JP] add jp assets, equipment module	2020-06-13 02:51:10 +09:00
event	Revert "Optimization: [EN] changed translator"	2020-06-03 13:51:54 -03:00
exercise	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
handler	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
hard	Add: [JP] add jp assets, hard module	2020-06-13 02:52:10 +09:00
map	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
retire	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +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
exception.py	Fix: 修复地图特效导致的章节名识别错误和进图等待	2020-04-25 17:10:22 +08:00
logger.py	Add: Set up logging.raiseExceptions to False to silence exceptions	2020-06-03 05:30:14 -03:00