Merge branch 'developer' into FireWorld

# Conflicts:
#	worlds/worlds.json

models/grass/grass.mtl

@@ -0,0 +1,9 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/islands/isle.mtl

@@ -0,0 +1,28 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Groen.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.3
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Bruin.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Wit.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/islands/isle2.mtl

@@ -0,0 +1,28 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Groen.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.3
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Bruin.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Wit.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/puddle/Puddle.mtl

@@ -0,0 +1,21 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd congruent_pentagon2.png
+illum 7
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd congruent_pentagon_blue.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+