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/ttd21_b030_01.mdl
+++ b/nwnds_overland/ttd21_b030_01.mdl
@@ -60,7 +60,11 @@ node trimesh groundbot48
  specular 0 0 0
  shininess 1
  center 341 1.00003 43.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 80
    -1.4 4.8 -0.46
    0.97 -4.79 0.04