Merge remote branch 'origin/tzork/facility114x'

Conflicts:
	scripts/shaderlist.txt

diff --cc scripts/shaderlist.txt
index 20aec31d478e3bf374ebbfee928cc759f8c2f5d3,b3ceaa311e01bdc73691c837db6d054f591817b7..73b57b56aaf3b5f041713fc209de8ada09f19dd2
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,5 -1,5 +1,6 @@@
- common\r
- exosystem\r
- exx\r
- trak5x\r
- trak4x
++common
+ exosystem
+ exx
+ trak5x
+ trak4x
 -facility114x
++facility114x