Merge branch 'patch-2' into 'master'

fix--原石竜インペリアル・ドラゴン、原石の皇脈

See merge request !40
10 jobs for master in 49 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Prepare
passed #123792
linux
merge_databases

00:00:09

 
  Prepare2
passed #123793
linux
json

00:00:14

passed #123794
linux
json2

00:00:10

 
  Pack
passed #123795
linux
neos

00:00:11

passed #123796
linux
pack

00:00:07

passed #123797
linux
server

00:00:05

 
  Deploy
passed #123801
linux
deploy_to_koishi

00:00:12

passed #123800
linux
deploy_to_tiramisu

00:00:13

passed #123798
linux
upload_neos

00:00:08

passed #123799
linux
upload_version_json

00:00:09