Merge branch 'undefined' into 'master'

add--Magicolloidal Sol

See merge request !67
10 jobs for master in 49 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #127689
linux
merge_databases

00:00:09

 
  Prepare2
passed #127690
linux
json

00:00:12

passed #127691
linux
json2

00:00:14

 
  Pack
passed #127692
linux
neos

00:00:11

passed #127693
linux
pack

00:00:07

passed #127694
linux
server

00:00:05

 
  Deploy
passed #127698
linux
deploy_to_koishi

00:00:13

passed #127697
linux
deploy_to_tiramisu

00:00:11

passed #127695
linux
upload_neos

00:00:04

passed #127696
linux
upload_version_json

00:00:07