Merge branch 'develop'

jlfarris91 · Jul 31, 2022 · 19371e4 · 19371e4
2 parents 52f91de + eb4a2a0
commit 19371e4
Show file tree

Hide file tree

Showing 597 changed files with 825,154 additions and 11,106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,7 @@ wurst_run.args
 /maps/Sandbox.w3x
 /maps/TestMap.w3x
 /maps/zoo.w3x
-/maps/TheLastStand.w3x/*/
+/maps/TheLastStand.w3x/*/
+
+/wurst/Save/*
+*.blend1
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,4 @@
 url=https://github.com/jlfarris91/WurstCore.git
 [submodule "_build/dependencies/wurstStdlib2"]
 	path = _build/dependencies/wurstStdlib2
-	url = https://github.com/jlfarris91/WurstStdlib2
+	url = https://github.com/jlfarris91/WurstStdlib2
diff --git a/Resources/Units/Tombstone/TombStone0.mdx b/Resources/Units/Tombstone/TombStone0.mdx
diff --git a/Resources/Units/Tombstone/TombStone1.mdx b/Resources/Units/Tombstone/TombStone1.mdx
diff --git a/Resources/Units/Tombstone/TombStone2.mdx b/Resources/Units/Tombstone/TombStone2.mdx
diff --git a/Resources/buildings/tunnel/TunnelEntrance.blend b/Resources/buildings/tunnel/TunnelEntrance.blend
diff --git a/Resources/buildings/tunnel/TunnelEntrance.blend1 b/Resources/buildings/tunnel/TunnelEntrance.blend1