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/bug01_k01_01.mdl
+++ b/nwnds_overland/bug01_k01_01.mdl
@@ -48,7 +48,11 @@ node aabb wok_141
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 31
+<<<<<<< HEAD
    ttd21_sand01
+=======
+    trd21_sand08
+>>>>>>> nwnds_acidchalk
    Dirt
    Obscuring
    Grass