Merge branch 'master' into Mirio/crystalcave

diff --cc scripts/shaderlist.txt
index abf822be2833f8acb90589a6b1665dcbcda6078b,3892df04d035c1a2e52975adfaaf6fcb43e07348..31216e7eaf0b890b615ea266a350f1cba51cb9fb
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,11 -19,12 +19,13 @@@ liquids_slim
  liquids_water
  logos
  map_atelier
+ map_boil
  map_catharsis
 +map_crystalcave
  map_courtfun
  map_darkzone
- map_g-23
+ map_erbium
+ map_geoplanetary
  map_glowplant
  map_implosion
  map_leave_em_behind