Merge branch 'nwnds_acidchalk'

2021-07-30 07:56:33 -04:00
parent c5a358631d e5772c4db7
commit ba375e1833
692 changed files with 75779 additions and 0 deletions
--- a/nwnds_overland/feldcabdoppelc.mdl
+++ b/nwnds_overland/feldcabdoppelc.mdl
@@ -3130,7 +3130,11 @@ node trimesh gras
  Specular 0.0 0.0 0.0 
  shininess 11
  center 0.0 0.0 0.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 18
    -5.0 -5.0 0.0
    -3.0 -5.0 0.0