Merge branch 'patch-6' into 'master'

Fix 轟海皇 ポセイドラ

See merge request !145
23 jobs for master in 8 minutes and 21 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #144656
linux
merge_databases

00:00:10

 
  Prepare2
passed #144657
linux
json

00:00:32

passed #144658
linux
json2

00:00:27

 
  Pack
passed #144659
linux
neos

00:01:55

passed #144672
linux
pack

00:00:14

passed #144661
linux
server

00:01:46

failed #144671
linux
pack

00:00:09

failed #144670
linux
pack

00:00:10

failed #144669
linux
pack

00:00:09

failed #144668
linux
pack

00:00:09

failed #144667
linux
pack

00:00:09

failed #144666
linux
pack

00:00:10

failed #144660
linux
pack

00:00:09

 
  Deploy
passed #144665
linux
deploy_to_koishi

00:01:59

passed #144678
linux
deploy_to_tiramisu

00:01:26

passed #144677
linux
upload_neos

00:01:50

passed #144675
linux
upload_version_json

00:00:11

failed #144676
linux
deploy_to_tiramisu

00:00:09

failed #144673
linux
deploy_to_tiramisu

00:00:10

failed #144664
linux
deploy_to_tiramisu

00:00:10

failed #144674
linux
upload_neos

00:00:12

failed #144662
linux
upload_neos

00:00:11

failed #144663
linux
upload_version_json

00:00:11