Merge branch 'patch-5' into 'master'

Fix fusion materials

See merge request !251
15 jobs for master in 49 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #223037
linux
add_script_diff

00:00:39

passed #223035
linux
fail_if_banned_files

00:00:03

passed #223036
linux
merge_databases

00:00:07

 
  Prepare2
passed #223038
linux
json

00:00:09

passed #223039
linux
json2

00:00:08

passed #223040
linux
redtext

00:00:08

 
  Pack
canceled #223041
linux
neos

00:00:00

canceled #223042
linux
pack

canceled #223043
linux
server

canceled #223044
linux
server_clear

 
  Deploy
canceled #223048
linux
deploy_to_koishi

canceled #223049
linux
deploy_to_koishi_clear

canceled #223047
linux
deploy_to_tiramisu

canceled #223045
linux
upload_neos

canceled #223046
linux
upload_version_json