Merge branch 'nwnds_acidchalk'

nwnds_overland/ttd21_d003_06.mdl

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Exported from NWMax Plus v6.11.28 at 5/17/2020 10:58:13 AM
+=======
+# Exported from NWMax Plus v6.11.28 at 6/28/2021 7:42:57 PM
+>>>>>>> nwnds_acidchalk
 # mdl file
 #
 #NWMax Plus MODEL  ASCII
@@ -12,6 +16,7 @@ beginmodelgeom ttd21_d003_06
 node dummy ttd21_d003_06
   parent NULL
 endnode
+<<<<<<< HEAD
 #Tile trimesh node
 node trimesh cote03
   parent ttd21_d003_06
@@ -60,11 +65,17 @@ node trimesh cote03
     1.0 0.147887 0
     1.0 0.992958 0
 endnode
+=======
+>>>>>>> nwnds_acidchalk
 node dummy tat01_c02_06a
   parent ttd21_d003_06
   position 0.0 0.0 3.0
   orientation 1.0 0.0 0.0 0.0
+<<<<<<< HEAD
   wirecolor 0.835294 0.603922 0.898039 
+=======
+  wirecolor 0.603922 0.843137 0.898039 
+>>>>>>> nwnds_acidchalk
 endnode
 node aabb WOK
   parent ttd21_d003_06
@@ -147,8 +158,13 @@ node trimesh wok005
   Diffuse 1.0 1.0 1.0 
   Specular 0.0 0.0 0.0 
   shininess 1
+<<<<<<< HEAD
   center undefined
   bitmap ttd21_sand01
+=======
+  center 0.0 0.0 32.5 
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
   verts 46
     -5.0 -5.0 0.0
     -2.5 -5.0 0.0