Uploaded fixed overland hak

Uploaded fixed overland hak.
2021-07-30 21:53:04 -04:00
parent 818f5318d6
commit d6b5135161
657 changed files with 0 additions and 23676 deletions
--- a/nwnds_overland/ttd21_e158_02.mdl
+++ b/nwnds_overland/ttd21_e158_02.mdl
@@ -289,11 +289,7 @@ node trimesh nmc_08237474
  shininess 1
  shadow 0
  rotatetexture 1
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  orientation 0 0 0 0
  scale 1
  alpha 1
@@ -584,11 +580,7 @@ node trimesh nmc_08238ad4
  shininess 1
  shadow 0
  rotatetexture 1
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  orientation 0 0 0 0
  scale 1
  alpha 1