???

2021-08-16 10:39:21 -04:00
parent a7f9fcdebe
commit b502bde656
2458 changed files with 62 additions and 1800044 deletions
--- a/nwnds_overland/ttd21_b030_09.mdl
+++ b/nwnds_overland/ttd21_b030_09.mdl
@@ -2772,7 +2772,11 @@ node trimesh groundbot99
  specular 0 0 0
  shininess 1
  center -340.5 1.50002 43.5
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 104
    1.39 4.8 -0.46
    -0.96 4.81 0.04