Merge branch 'master' into develop

2024-09-01 17:34:42 +00:00 · 2020-08-02 08:04:56 -07:00
parent 380fa1c489 39fd1d6689
commit a9bdd45a83
106 changed files with 622 additions and 278 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto2-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto2-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-qube-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-qube-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rovemate-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rovemate-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-leg-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-125-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-125-2.mu