Conflicts:
scripts/shaderlist.txt
common
decals
+ effects_beam
effects_forcefield
effects_healpod
effects_item
liquids_lava
liquids_slime
liquids_water
+ logos
+map_afterslime
map_glowplant
+ map_leave_em_behind
+ map_newtonian-nightmare
map_red-planet
map_space-elevator
- map_techassault
map_stormkeep
+ map_techassault
+ map_xoylent
model_bigfan01
+ model_crate02
model_desertfactory
+ model_teleporters
model_tree
+ model_walker-static
model_xonotic_jumppad01
+ model_xoylent
narmorx
proceduralx
+ screens
skies_calm_sea
skies_distant_sunset
skies_exosystem2