Merge branch '1-8-updates' into develop

# Conflicts: # Distribution/Restock/changelog.txt
2024-09-01 17:34:42 +00:00 · 2019-10-19 15:54:09 -07:00
parent 42d4d13310 07d080af8d
commit 90437519e9
157 changed files with 3430 additions and 129 deletions
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-b.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-b.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1-e.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1-e.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1-n.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1-n.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2-n.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2-n.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3-n.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3-n.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-e.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-e.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-n.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-n.tga
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.dds
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.dds
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.tga
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.tga