Merge branch 'patch-7' into 'master'

Fix 極寒の氷柱

See merge request !152
10 jobs for master in 1 minute and 21 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #147717
linux
merge_databases

00:00:13

 
  Prepare2
passed #147718
linux
json

00:00:24

passed #147719
linux
json2

00:00:24

 
  Pack
passed #147720
linux
neos

00:00:18

passed #147721
linux
pack

00:00:16

passed #147722
linux
server

00:00:08

 
  Deploy
passed #147726
linux
deploy_to_koishi

00:00:24

passed #147725
linux
deploy_to_tiramisu

00:00:14

passed #147723
linux
upload_neos

00:00:08

passed #147724
linux
upload_version_json

00:00:08