Merge branch 'master' into mirio/crystalcave

diff --cc scripts/shaderlist.txt
index a7fd2108a15fb9cbc8e28e66105e9ea4267f381b,1ab8c0ece645d29ec903330dd0fcb29556405552..e6ce0af94cefb4c147869ef525882e00413063cd
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,8 -19,8 +19,9 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
+ map_atelier
  map_catharsis
 +map_crystalcave
  map_courtfun
  map_darkzone
  map_g-23