Fix merge

2024-09-01 17:34:42 +00:00 · 2019-10-24 13:48:44 -07:00
parent 94a0c824c9 3eee862769
commit 099bb79f36
36 changed files with 54 additions and 121 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-3.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-3.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1.tga
--- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg
@ -5,8 +5,8 @@
 // - Rockomax HubMax Multi-Point Connector (stationHub)
 // - BZ-52 Radial Attachment Point (stackPoint1)
 // - TVR-200 Stack Bi-Coupler (stackBiCoupler_v2)
-// - TVR-300 Stack Tri-Coupler (stackTriCoupler_v2)
-// - TVR-400 Stack Quad-Coupler (stackQuadCoupler)
+// - TVR-1180C Mk1 Stack Tri-Coupler (stackTriCoupler_v2)
+// - TVR-2160C Mk2 Stack Quad-Coupler (stackQuadCoupler)

@PART[adapterSmallMiniTall]
 {
--- a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
+++ b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll