Move changelog entry to the correct version

- Add VABOrganizer support
- Fix spurious png file (#1017)

Distribution/Restock/.mod_data.yml

@@ -13,8 +13,9 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.2.1
+    location: url
-    location: s3
+    url: https://ksp.sarbian.com/jenkins/job/ModuleManager/163/artifact/ModuleManager.4.2.3.dll
+    zip: false
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

Distribution/Restock/GameData/ReStock/Localization/ru.cfg

@@ -1,8 +1,8 @@
 // Предлагаемый формат:
 // #LOC_Restock_partconfigname_fieldname
 // например.
-// # LOC_Restock_restock-engine-375-3_title = ...
+// #LOC_Restock_restock-engine-375-3_title = ...
-// # LOC_Restock_restock-engine-375-3_description = ...
+// #LOC_Restock_restock-engine-375-3_description = ...
 
 Localization
 {
@@ -13,149 +13,149 @@ Localization
     #LOC_Restock_scanner_screen_off = Выключить дисплей
     #LOC_Restock_scanner_screen_toggle = Вкл./выкл. дисплей
 
-    # LOC_Restock_variant-engine_size0 = 0,625 м
+    #LOC_Restock_variant-engine_size0 = 0,625 м
-    # LOC_Restock_variant-engine_size0_white = 0,625 м (Белый кожух)
+    #LOC_Restock_variant-engine_size0_white = 0,625 м (Белый кожух)
-    # LOC_Restock_variant-engine_size0_grey-orange = 0,625 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size0_grey-orange = 0,625 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size1 = 1,25 м
+    #LOC_Restock_variant-engine_size1 = 1,25 м
-    # LOC_Restock_variant-engine_size1_white = 1,25 м (Белый кожух)
+    #LOC_Restock_variant-engine_size1_white = 1,25 м (Белый кожух)
-    # LOC_Restock_variant-engine_size1_grey-orange = 1,25 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size1_grey-orange = 1,25 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size1p5 = 1,875 м
+    #LOC_Restock_variant-engine_size1p5 = 1,875 м
-    # LOC_Restock_variant-engine_size1p5_white = 1,875 м (Белый кожух)
+    #LOC_Restock_variant-engine_size1p5_white = 1,875 м (Белый кожух)
-    # LOC_Restock_variant-engine_size1p5_grey-orange = 1,875 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1,875 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size2 = 2,5 м
+    #LOC_Restock_variant-engine_size2 = 2,5 м
-    # LOC_Restock_variant-engine_size2_white = 2,5 м (Белый кожух)
+    #LOC_Restock_variant-engine_size2_white = 2,5 м (Белый кожух)
-    # LOC_Restock_variant-engine_size2_grey-orange = 2,5 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size2_grey-orange = 2,5 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size3 = 3,75 м
+    #LOC_Restock_variant-engine_size3 = 3,75 м
-    # LOC_Restock_variant-engine_compact = Компактный
+    #LOC_Restock_variant-engine_compact = Компактный
-    # LOC_Restock_variant-engine_compact_white = Компактный (Белый кожух)
+    #LOC_Restock_variant-engine_compact_white = Компактный (Белый кожух)
-    # LOC_Restock_variant-engine_compact_grey-orange = Компактный (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_compact_grey-orange = Компактный (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_radial = Радиальный
+    #LOC_Restock_variant-engine_radial = Радиальный
-    # LOC_Restock_variant-engine_boattail = Хвостовая часть
+    #LOC_Restock_variant-engine_boattail = Хвостовая часть
-    # LOC_Restock_variant-engine_boattail_white = Хвостовая часть (Белая)
+    #LOC_Restock_variant-engine_boattail_white = Хвостовая часть (Белая)
-    # LOC_Restock_variant-engine_boattail_grey-orange = Хвостовая часть (Оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_grey-orange = Хвостовая часть (Оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_orange = Хвостовая часть (Оранжевая)
+    #LOC_Restock_variant-engine_boattail_orange = Хвостовая часть (Оранжевая)
-    # LOC_Restock_variant-engine_boattail_metal = Хвостовая часть (Металлик)
+    #LOC_Restock_variant-engine_boattail_metal = Хвостовая часть (Металлик)
-    # LOC_Restock_variant-engine_boattail_dark = Хвостовая часть (Темная)
+    #LOC_Restock_variant-engine_boattail_dark = Хвостовая часть (Темная)
-    # LOC_Restock_variant-engine_boattail_size1 = Хвостовая часть (1,25 м)
+    #LOC_Restock_variant-engine_boattail_size1 = Хвостовая часть (1,25 м)
-    # LOC_Restock_variant-engine_boattail_size1p5 = Хвостовая часть (1,875 м)
+    #LOC_Restock_variant-engine_boattail_size1p5 = Хвостовая часть (1,875 м)
-    # LOC_Restock_variant-engine_boattail_size1_white = Хвостовая часть (1,25 м, белая)
+    #LOC_Restock_variant-engine_boattail_size1_white = Хвостовая часть (1,25 м, белая)
-    # LOC_Restock_variant-engine_boattail_size1p5_white = Хвостовая часть (1,875 м, белая)
+    #LOC_Restock_variant-engine_boattail_size1p5_white = Хвостовая часть (1,875 м, белая)
-    # LOC_Restock_variant-engine_boattail_size1_grey-orange = Хвостовая часть (1,25 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Хвостовая часть (1,25 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Хвостовая часть (1,875 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Хвостовая часть (1,875 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_tankbutt_size2_white = Крепление к баку (2,5 м, белый)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = Крепление к баку (2,5 м, белый)
-    # LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Крепление к баку (2,5 м, оранжевый/серый)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Крепление к баку (2,5 м, оранжевый/серый)
-    # LOC_Restock_variant-engine_singlebell_compact = Одно сопло, Компактный
+    #LOC_Restock_variant-engine_singlebell_compact = Одно сопло, Компактный
-    # LOC_Restock_variant-engine_singlebell_compact_white = Одно сопло, компактный вариант (Белый кожух)
+    #LOC_Restock_variant-engine_singlebell_compact_white = Одно сопло, компактный вариант (Белый кожух)
-    # LOC_Restock_variant-engine_singlebell_compact_grey-orange = Одно сопло, компактный вариант (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Одно сопло, компактный вариант (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_singlebell = Одно сопло
+    #LOC_Restock_variant-engine_singlebell = Одно сопло
-    # LOC_Restock_variant-engine_singlebell_white = Одно сопло (белый кожух)
+    #LOC_Restock_variant-engine_singlebell_white = Одно сопло (белый кожух)
-    # LOC_Restock_variant-engine_singlebell_grey-orange = Одно сопло (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = Одно сопло (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_quadbell = Четыре сопла
+    #LOC_Restock_variant-engine_quadbell = Четыре сопла
-    # LOC_Restock_variant-engine_quadbell_white = Четыре сопла (Белый кожух)
+    #LOC_Restock_variant-engine_quadbell_white = Четыре сопла (Белый кожух)
-    # LOC_Restock_variant-engine_quadbell_grey-orange = Четыре сопла (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = Четыре сопла (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_quadbell_compact = Четыре сопла, Компактный
+    #LOC_Restock_variant-engine_quadbell_compact = Четыре сопла, Компактный
-    # LOC_Restock_variant-engine_quadbell_compact_white = Четыре сопла, Компактный (Белый кожух)
+    #LOC_Restock_variant-engine_quadbell_compact_white = Четыре сопла, Компактный (Белый кожух)
-    # LOC_Restock_variant-engine_quadbell_compact_grey-orange = Четыре сопла, Компактный (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = Четыре сопла, Компактный (Оранжевый/серый кожух)
 
-    # LOC_Restock_variant-engine_boattail_size2_white = Хвостовая часть (2,5 м, белая)
+    #LOC_Restock_variant-engine_boattail_size2_white = Хвостовая часть (2,5 м, белая)
-    # LOC_Restock_variant-engine_boattail_size2_grey-orange = Хвостовая часть (2,5 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size2_grey-orange = Хвостовая часть (2,5 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_size3_white = Хвостовая часть (3,75 м, белая)
+    #LOC_Restock_variant-engine_boattail_size3_white = Хвостовая часть (3,75 м, белая)
-    # LOC_Restock_variant-engine_boattail_size3_grey-orange = Хвостовая часть (3,75 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size3_grey-orange = Хвостовая часть (3,75 м, оранжевая/серая)
 
-    # LOC_Restock_variant-engine_shroud_white = Белый кожух
+    #LOC_Restock_variant-engine_shroud_white = Белый кожух
-    # LOC_Restock_variant-engine_shroud_grey-orange = Металлический кожух
+    #LOC_Restock_variant-engine_shroud_grey-orange = Металлический кожух
 
-    # LOC_Restock_variant-engine_shroud = Кожух
+    #LOC_Restock_variant-engine_shroud = Кожух
-    # LOC_Restock_variant-engine_shroud_wide = Широкий кожух
+    #LOC_Restock_variant-engine_shroud_wide = Широкий кожух
-    # LOC_Restock_variant-engine_docking = Стыковочный порт
+    #LOC_Restock_variant-engine_docking = Стыковочный порт
 
-    # LOC_Restock_variant-mount_classic = Классический
+    #LOC_Restock_variant-mount_classic = Классический
-    # LOC_Restock_variant-mount_classic_white = Классический (Белый кожух)
+    #LOC_Restock_variant-mount_classic_white = Классический (Белый кожух)
-    # LOC_Restock_variant-mount_classic_grey-orange = Классический (Оранжевый/серый кожух)
+    #LOC_Restock_variant-mount_classic_grey-orange = Классический (Оранжевый/серый кожух)
-    # LOC_Restock_variant-mount_truss = Каркас
+    #LOC_Restock_variant-mount_truss = Каркас
-    # LOC_Restock_variant-mount_compact = Компактный
+    #LOC_Restock_variant-mount_compact = Компактный
-    # LOC_Restock_variant-mount_mounted = С креплением
+    #LOC_Restock_variant-mount_mounted = С креплением
 
-    # LOC_Restock_variant-gold-truss = Золотой (Каркас)
+    #LOC_Restock_variant-gold-truss = Золотой (Каркас)
-    # LOC_Restock_variant-silver-truss = Серебряный (Каркас)
+    #LOC_Restock_variant-silver-truss = Серебряный (Каркас)
 
-    # LOC_Restock_variant-engine_pod-orange = Корпус (оранжевый)
+    #LOC_Restock_variant-engine_pod-orange = Корпус (оранжевый)
-    # LOC_Restock_variant-engine_pod-gray = Корпус (серый)
+    #LOC_Restock_variant-engine_pod-gray = Корпус (серый)
 
-    # LOC_Restock_variant-antenna_size0 = 0,625 м
+    #LOC_Restock_variant-antenna_size0 = 0,625 м
-    # LOC_Restock_variant-antenna_size1 = 1,25 м
+    #LOC_Restock_variant-antenna_size1 = 1,25 м
-    # LOC_Restock_variant-antenna_truss = Каркас
+    #LOC_Restock_variant-antenna_truss = Каркас
-    # LOC_Restock_variant-antenna_compact = Компактная
+    #LOC_Restock_variant-antenna_compact = Компактная
-    # LOC_Restock_variant-antenna_radial = Радиальная
+    #LOC_Restock_variant-antenna_radial = Радиальная
-    # LOC_Restock_variant-antenna_radial_reverse = Радиальная (в противоположную сторону)
+    #LOC_Restock_variant-antenna_radial_reverse = Радиальная (в противоположную сторону)
-    # LOC_Restock_variant-antenna_axial = Осевая
+    #LOC_Restock_variant-antenna_axial = Осевая
-    # LOC_Restock_variant-antenna_axial_reverse = Осевая (в противоположную сторону)
+    #LOC_Restock_variant-antenna_axial_reverse = Осевая (в противоположную сторону)
 
-    # LOC_Restock_variant-telescope_shielded = Экранированный
+    #LOC_Restock_variant-telescope_shielded = Экранированный
-    # LOC_Restock_variant-telescope_bare = Без экрана
+    #LOC_Restock_variant-telescope_bare = Без экрана
 
-    # LOC_Restock_variant-pod_bare = Без покрытия
+    #LOC_Restock_variant-pod_bare = Без покрытия
-    # LOC_Restock_variant-pod_fabric_green = Зеленое покрытие
+    #LOC_Restock_variant-pod_fabric_green = Зеленое покрытие
-    # LOC_Restock_variant-pod_fabric_beige = Бежевое покрытие
+    #LOC_Restock_variant-pod_fabric_beige = Бежевое покрытие
-    # LOC_Restock_variant-pod_fabric_white = Белое покрытие
+    #LOC_Restock_variant-pod_fabric_white = Белое покрытие
 
-    # LOC_Restock_variant-wheel_broken = Поврежденное
+    #LOC_Restock_variant-wheel_broken = Поврежденное
-    # LOC_Restock_variant-wheel_bare = Без крыла
+    #LOC_Restock_variant-wheel_bare = Без крыла
 
-    # LOC_Restock_variant-surface_metal = Металлик
+    #LOC_Restock_variant-surface_metal = Металлик
-    # LOC_Restock_variant-surface_basic = Базовый
+    #LOC_Restock_variant-surface_basic = Базовый
-    # LOC_Restock_variant-surface_truss = Балка
+    #LOC_Restock_variant-surface_truss = Балка
-    # LOC_Restock_variant-surface_warningStripes = Сигнальные полосы
+    #LOC_Restock_variant-surface_warningStripes = Сигнальные полосы
-    # LOC_Restock_variant-surface_thermalblankets = Теплоизоляция
+    #LOC_Restock_variant-surface_thermalblankets = Теплоизоляция
-    # LOC_Restock_variant-surface_yellow = Желтый
+    #LOC_Restock_variant-surface_yellow = Желтый
-    # LOC_Restock_variant-surface_black = Черный
+    #LOC_Restock_variant-surface_black = Черный
-    # LOC_Restock_variant-surface_white = Белый
+    #LOC_Restock_variant-surface_white = Белый
-    # LOC_Restock_variant-surface_blue = Синий
+    #LOC_Restock_variant-surface_blue = Синий
 
-    # LOC_Restock_variant-strut_classic_metal = Металлик
+    #LOC_Restock_variant-strut_classic_metal = Металлик
-    # LOC_Restock_variant-strut_classic_white = Белый
+    #LOC_Restock_variant-strut_classic_white = Белый
-    # LOC_Restock_variant-strut_compact_metal = Металлик (компактный)
+    #LOC_Restock_variant-strut_compact_metal = Металлик (компактный)
-    # LOC_Restock_variant-strut_compact_white = Белый (компактный)
+    #LOC_Restock_variant-strut_compact_white = Белый (компактный)
     
-    # LOC_Restock_variant-decoupler_metal = Металлик
+    #LOC_Restock_variant-decoupler_metal = Металлик
-    # LOC_Restock_variant-decoupler_grey-orange = Оранжевый/серый
+    #LOC_Restock_variant-decoupler_grey-orange = Оранжевый/серый
 
-    # LOC_Restock_variant-service-bay-opaque = Сплошная перегородка
+    #LOC_Restock_variant-service-bay-opaque = Сплошная перегородка
-    # LOC_Restock_variant-service-bay-transparent = Каркасная перегородка
+    #LOC_Restock_variant-service-bay-transparent = Каркасная перегородка
-    # LOC_Restock_variant-service-bay-hollow = Без перегородки
+    #LOC_Restock_variant-service-bay-hollow = Без перегородки
-    # LOC_Restock_variant-service-bay-open = Открыть
+    #LOC_Restock_variant-service-bay-open = Открыть
-    # LOC_Restock_variant-service-bay-tunnel = Стыковочный туннель
+    #LOC_Restock_variant-service-bay-tunnel = Стыковочный туннель
-    # LOC_Restock_variant-service-bay-shelves = Полки
+    #LOC_Restock_variant-service-bay-shelves = Полки
 
-    # LOC_Restock_variant-heat-shield-black = Черный
+    #LOC_Restock_variant-heat-shield-black = Черный
-    # LOC_Restock_variant-heat-shield-brown = Классический
+    #LOC_Restock_variant-heat-shield-brown = Классический
-    # LOC_Restock_variant-heat-shield-red = Неокрашенный
+    #LOC_Restock_variant-heat-shield-red = Неокрашенный
 
-    # LOC_Restock_variant-linear-rcs-pod = С корпусом
+    #LOC_Restock_variant-linear-rcs-pod = С корпусом
-    # LOC_Restock_variant-linear-rcs-bare = Без корпуса
+    #LOC_Restock_variant-linear-rcs-bare = Без корпуса
 
-    # LOC_Restock_variant-stayputnik-pod = С креплением
+    #LOC_Restock_variant-stayputnik-pod = С креплением
-    # LOC_Restock_variant-stayputnik-bare = Без крепления
+    #LOC_Restock_variant-stayputnik-bare = Без крепления
-    # LOC_Restock_variant-probe-gold = Золотой
+    #LOC_Restock_variant-probe-gold = Золотой
-    # LOC_Restock_variant-probe-silver = Серебряный
+    #LOC_Restock_variant-probe-silver = Серебряный
-    # LOC_Restock_variant-probe-bare = Базовый
+    #LOC_Restock_variant-probe-bare = Базовый
 
-    # LOC_Restock_variant-radiator_basic = Базовый
+    #LOC_Restock_variant-radiator_basic = Базовый
-    # LOC_Restock_variant-radiator_flat = Плоский
+    #LOC_Restock_variant-radiator_flat = Плоский
-    # LOC_Restock_variant-radiator_compact = Компактный
+    #LOC_Restock_variant-radiator_compact = Компактный
 
-    # LOC_Restock_variant-tube-length-short = Короткая
+    #LOC_Restock_variant-tube-length-short = Короткая
-    # LOC_Restock_variant-tube-length-med-short = Средне-короткая
+    #LOC_Restock_variant-tube-length-med-short = Средне-короткая
-    # LOC_Restock_variant-tube-length-med = Средняя
+    #LOC_Restock_variant-tube-length-med = Средняя
-    # LOC_Restock_variant-tube-length-med-long = Средне-длинная
+    #LOC_Restock_variant-tube-length-med-long = Средне-длинная
-    # LOC_Restock_variant-tube-length-long = Длинная
+    #LOC_Restock_variant-tube-length-long = Длинная
 
-    # LOC_Restock_variant-tube-length-short-alt = Короткая (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-short-alt = Короткая (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-short-alt = Средне-короткая (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-short-alt = Средне-короткая (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-alt = Средняя (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-alt = Средняя (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-long-alt = Средне-длинная (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-long-alt = Средне-длинная (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-long-alt = Длинная (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-long-alt = Длинная (альтернативный вариант)
 
-    # LOC_Restock_description-FuelCellArray = Зачем использовать только один маленький топливный элемент, когда можно установить три больших? Сборка из трех топливных элементов идеально подходит для ситуаций, когда вам нужен большой источник бесперебойного питания. Как и меньший топливный элемент, эта сборка работает путем преобразования топлива и окислителя в электрическую энергию.
+    #LOC_Restock_description-FuelCellArray = Зачем использовать только один маленький топливный элемент, когда можно установить три больших? Сборка из трех топливных элементов идеально подходит для ситуаций, когда вам нужен большой источник бесперебойного питания. Как и меньший топливный элемент, эта сборка работает путем преобразования топлива и окислителя в электрическую энергию.
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg

@@ -1,14 +1,14 @@
 // Patches applying art changes to probe parts
 // Contents:
+// - Probodobodyne QBE (probeCoreCube)
+// - Probodobodyne Stayputnik (probeCoreSphere_v2)
 // - Probodobodyne HECS (probeCoreHex_v2)
 // - Probodobodyne OKTO (probeCoreOcto_v2)
 // - Probodobodyne OKTO2 (probeCoreOcto2_v2)
-// - Probodobodyne Stayputnik (probeCoreSphere_v2)
-// - Probodobodyne QBE (probeCoreCube)
 // - Probodobodyne HECS2 (HECS2_ProbeCore)
 // - Probodobodyne RoveMate (roverBody_v2)
-// - RC-L01 Remote Guidance Unit (probeStackLarge)
 // - RC-001S Remote Guidance Unit (probeStackSmall)
+// - RC-L01 Remote Guidance Unit (probeStackLarge)
 
 // QBE
 @PART[probeCoreCube]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -20,6 +20,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-qube-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2859,0.9363,0.135, 0.2859,0.9365,0.135, 0.2378,0.936,0.1355, 0.2378,0.9361,0.1355, 0.2859,0.9415,0.135, 0.2859,0.9415,0.135, 0,-1.49E-08,1.776E-15, 0.4885,0.5855,0.4885
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -89,6 +94,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7138,0.7224,0.555, 0.7138,0.7223,0.555, 0.6414,0.4475,0.5448, 0.6414,0.5677,0.6443, 0.7138,0.7218,0.555, 0.7138,0.722,0.555, 0,0.1422,0, 0.9058,1.008,0.9058
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -131,6 +141,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2532,0.8507,0.3093, 0.2532,0.8504,0.3093, 0.4086,0.997,0.09923, 0.4086,0.997,0.09923, 0.2846,0.7473,0.4278, 0.2846,0.7489,0.4278, 0,0.0006218,0, 0.7738,0.3751,0.6869
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -200,6 +215,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2648,0.7948,0.3164, 0.2648,0.7922,0.3164, 0.3945,0.9742,0.1582, 0.3945,0.9742,0.1582, 0.2648,0.7908,0.3164, 0.2648,0.7893,0.3164, 1.788E-07,0,4.172E-07, 0.6866,0.3848,0.6866
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -269,6 +289,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.06879,0.7797,0.2855, 0.06879,0.7815,0.2855, 0.2805,0.9745,0.1119, 0.2805,0.9744,0.1119, 0.06879,0.7758,0.2855, 0.06879,0.7706,0.2855, 1.252E-06,-3.725E-09,-3.01E-06, 0.5828,0.1206,0.5828
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -338,6 +363,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 1.433,0.8207,0.8363, 1.433,0.8226,0.8363, 1.832,0.9705,0.221, 1.832,0.9705,0.221, 1.56,0.7408,0.7851, 1.56,0.7396,0.7851, -1.329E-05,0,2.283E-05, 1.638,0.9988,1.455
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -490,7 +520,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3123,0.71,0.7274, 0.3123,0.7034,0.7331, 1.402,0.9681,0.1515, 1.402,0.9704,0.1515, 0.3077,0.701,0.7337, 0.3077,0.7054,0.7279, -0.005277,-9.855E-05,0.0009629, 1.261,0.2428,1.273
+    cube = Default, 0.2933,0.7015,0.758, 0.2933,0.7015,0.758, 1.398,0.9704,0.1499, 1.398,0.9739,0.1499, 0.2852,0.6621,0.7765, 0.2852,0.6625,0.7765, 0,0,0, 1.334,0.22,1.359
   }
 }
 
@@ -507,6 +537,6 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 1.028,0.7385,1.39, 1.028,0.7359,1.38, 5.274,0.9786,0.1842, 5.274,0.9776,0.1842, 1.072,0.7048,1.374, 1.072,0.7024,1.385, -0.0003395,0.0003387,-0.00157, 2.57,0.4079,2.58
+    cube = Default, 0.9721,0.7331,1.4, 0.9721,0.7336,1.4, 5.261,0.9806,0.1842, 5.261,0.9795,0.1842, 0.9997,0.7319,1.375, 0.9997,0.7309,1.42, -1.748E-09,2.384E-09,-0.02, 2.611,0.38,2.651
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg

@@ -42,7 +42,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -90,7 +90,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   MODULE
@@ -102,7 +101,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -162,7 +161,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -210,7 +209,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   !MODULE[ModulePartVariants] {}
@@ -223,7 +221,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -278,7 +276,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -348,7 +346,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -417,7 +415,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -486,7 +484,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -146,6 +146,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.01025,0.7987,0.2722, 0.01025,0.7975,0.2722, 0.00603,0.774,0.3413, 0.00603,0.7971,0.3281, 0.1637,1,0.09954, 0.1637,0.9751,0.1524, 7.587E-09,0,0.03411, 0.3466,0.4747,0.06439
+  }
 }
 
 // OX-STAT-XL Photovoltaic Panels
@@ -161,6 +166,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.04594,0.04438,0.3137, 0.04594,0.1383,0.3137, 0.02723,0.7552,0.8965, 0.02723,0.7537,0.8965, 1.28,1,0.09967, 1.28,0.01395,0.252, -2.98E-08,0,0.08014, 0.8,1.6,0.1631
+  }
 }
 
 // OX-10C Photovoltaic Panels

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg

@@ -6,7 +6,7 @@
 // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
 // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2_v2)
 // - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) - FX only
-// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only
+// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike)
 
 // LV-N "Nerv" Atomic Rocket Motor
 @PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -1749,9 +1749,23 @@
   }
 }
 
-// T-1 Toroidal "Aerospike" Liquid Fuel Engine (FX only)
+// T-1 Toroidal "Aerospike" Liquid Fuel Engine
 @PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-dart-1
+  }
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 1.355,0.7569,0.7222, 1.355,0.7569,0.7222, 1.213,0.9305,0.254, 1.213,0.7276,0.9296, 1.355,0.7569,0.7222, 1.355,0.7568,0.7222, 0,-0.394,0, 1.25,1.095,1.25
+    cube = Clean, 0.6549,0.6778,0.691, 0.6549,0.6778,0.691, 1.095,0.9444,0.2547, 1.095,0.7086,0.8151, 0.6549,0.6767,0.691, 0.6549,0.6789,0.691, 0,-0.3368,0, 1.188,0.9809,1.188
+  }
   !fx_exhaustFlame_blue  = DELETE
   !fx_exhaustLight_blue = DELETE
   !fx_smokeTrail_light = DELETE
@@ -1793,7 +1807,7 @@
         volume = 0.0 0.0
         volume = 1.0 1.0
         pitch = 0.0 0.2
-        pitch = 1.0 1.0
+        pitch = 2.0 2.0
         loop = true
       }
       MODEL_MULTI_PARTICLE
@@ -1829,4 +1843,80 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-dart-running
   }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = TrussMount
+    VARIANT
+    {
+	  name = TrussMount
+	  displayName = #LOC_Restock_variant-engine_size1
+	  primaryColor = #999999
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = true
+        Aerospike_12_Boattail = false
+		Aerospike_Shroud_Empty = true
+	  }
+	}
+	VARIANT
+    {
+	  name = Shroud
+	  displayName = #LOC_Restock_variant-engine_boattail
+	  primaryColor = #ffffff
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = false
+        Aerospike_12_Boattail = true
+		Aerospike_Shroud_Empty = false
+	  }
+	}
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = Aerospike_Shroud
+    %useMultipleDragCubes = true
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.05
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -121,7 +121,7 @@
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-poodle-running
-  }s
+  }
   !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg

@@ -8,7 +8,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-rhino-1
@@ -20,7 +20,6 @@
     cube = 0, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 11.07,0.9882,0.3025, 11.06,0.7086,4, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 0.002109,-0.5297,-0.002108, 5.308,4.086,5.308
     cube = 1, 11.59,0.7684,2.41, 11.59,0.7684,2.426, 11,0.5,3.35, 11,0.5,2.257, 11.59,0.7685,2.41, 11.59,0.7681,2.41, 0,-0.8842,0, 3.765,3.374,3.765
   }
-  #node_stack_bottom02 = 0.0, -2.536873, 0.0, 0.0, -1.0, 0.0, 3
   %node_attach = 0.0, 1.487975, 0.0, 0.0, 1.0, 0.0, 3
   @attachRules = 1,1,1,0,0
   !EFFECTS {}
@@ -272,7 +271,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-mammoth-1

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg

@@ -14,6 +14,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.3158,0.6901,0.4184, 0.3158,0.6901,0.4184, 0.3018,0.6431,0.4109, 0.3018,0.6432,0.4109, 0.3158,0.6882,0.4184, 0.3158,0.6892,0.4184, -1.49E-08,0,0, 0.6402,0.625,0.6402
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -97,6 +102,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7116,0.7432,0.4178, 0.7116,0.7432,0.4178, 0.3194,0.6708,0.4037, 0.3194,0.671,0.4037, 0.7116,0.742,0.4178, 0.7116,0.742,0.4178, 0,0,0, 0.6388,1.25,0.6388
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -183,7 +193,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3608,0.6239,0.7064, 0.3608,0.6124,0.7064, 1.21,0.96,0.2872447, 1.21,0.96,0.245615, 0.3608,0.616,0.7064, 0.3608,0.6181,0.7064, 0,0,0, 1.218,0.3161,1.218
+    cube = Default, 0.381,0.6261,0.7165, 0.381,0.6255,0.7165, 0.9252,0.7779,0.2652, 0.9252,0.7776,0.2652, 0.3681,0.6327,0.7308, 0.3681,0.6346,0.7308, 3.553E-17,-2.861E-08,-7.105E-17, 1.25,0.3325,1.267
   }
   !MODULE[ModulePartVariants] {}
   MODULE

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg

@@ -141,21 +141,23 @@
   }
   @MODULE[ModuleWheelBase]
   {
-    @clipObject = leg3_piston_CAPSULECOLLIDER
+    @wheelColliderTransformName = wheelCollider
+    @clipObject = piston_collider
   }
   @MODULE[ModuleWheelSuspension]
   {
-    @suspensionTransformName = leg3_piston
+    @suspensionTransformName = piston
-    @suspensionColliderName = leg3_piston_CAPSULECOLLIDER
+    @suspensionColliderName = piston_collider
   }
   @MODULE[ModuleWheelDeployment]
   {
-    @animationTrfName = leg3
+    @deployTargetTransformName = deployTgt
+    @animationTrfName = leg
     @animationStateName = restock-leg-3-deploy
-    @retractTransformName = leg3_piston
+    @retractTransformName = piston
   }
   @MODULE[ModuleWheelBogey]
   {
-    @bogeyTransformName = leg3_foot
+    @bogeyTransformName = foot
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg

@@ -387,7 +387,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelBasic =  false
         PanelHollow = false
@@ -503,7 +502,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelXLBasic =  false
         PanelXLHollow = false

Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg

@@ -22,7 +22,7 @@
   DRAG_CUBE
   {
     cube = Fairing, 0.05634,0.7512,0.6665, 0.05634,0.7603,0.5694, 0.3044,0.9566,0.1698, 0.3044,0.932,0.1674, 0.05487,0.7518,0.4044, 0.05488,0.7514,0.4076, 0.001332,0.001115,-0.002111, 0.625,0.1071,0.625
-    cube = Clean, 0.06044,0.4659,0.4447, 0.06044,0.4659,0.4447, 0.3843,0.9488,0.1482, 0.3843,0.9396,0.1682, 0.06044,0.4645,0.4447, 0.06044,0.4673,0.4447, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
+    cube = Clean, 0.05805,0.485,0.4482, 0.05805,0.485,0.4482, 0.3831,0.9519,0.1482, 0.3831,0.9428,0.1694, 0.05805,0.4835,0.4482, 0.05805,0.4866,0.4482, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
   }
   MODULE
   {

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg

@@ -35,7 +35,7 @@
     VARIANT
     {
       name = Short
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-short // Short
       primaryColor = #3a562a
@@ -70,7 +70,7 @@
     VARIANT
     {
       name = Medium-Short
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short // Medium-Short
       primaryColor = #3a562a
@@ -105,7 +105,7 @@
     VARIANT
     {
       name = Medium
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med // Medium
       primaryColor = #3a562a
@@ -140,7 +140,7 @@
     VARIANT
     {
       name = Medium-Long
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-long // Medium-Long
       primaryColor = #3a562a
@@ -210,7 +210,7 @@
     VARIANT
     {
       name = Short-Orange
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-short-alt // Short (Alternate)
       primaryColor = #f49841
@@ -245,7 +245,7 @@
     VARIANT
     {
       name = Medium-Short-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short-alt // Medium-Short (Alternate)
       primaryColor = #f49841
@@ -280,7 +280,7 @@
     VARIANT
     {
       name = Medium-Orange
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-alt // Medium (Alternate)
       primaryColor = #f49841
@@ -315,7 +315,7 @@
     VARIANT
     {
       name = Medium-Long-Orange
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-long-alt // Medium-Long (Alternate)
       primaryColor = #f49841
@@ -385,7 +385,7 @@
     VARIANT
     {
       name = Boattail-Dark
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_dark // Boattail (Dark)
       primaryColor = #4c4f47
@@ -420,7 +420,7 @@
     VARIANT
     {
       name = Boattail-White
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
       primaryColor = #ffffff
@@ -455,7 +455,7 @@
     VARIANT
     {
       name = Boattail-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_grey-orange // Boattail (Orange/Grey)
       primaryColor = #f49841

Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg

@@ -714,7 +714,7 @@
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
@@ -914,7 +914,7 @@
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }

Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-5.cfg

@@ -311,6 +311,10 @@
   MODEL
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1
+  }
+    MODEL
+  {
+    model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-2
   }
   MODEL
   {
@@ -326,16 +330,16 @@
   // 2 cones
   NODE
   {
-    name = N2_1
+    name = FixedN2_1
-    transform = N2_1
+    transform = FixedN2_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N2_2
+    name = FixedN2_2
-    transform = N2_2
+    transform = FixedN2_2
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -343,24 +347,24 @@
   // 3 cones
   NODE
   {
-    name = N3_1
+    name = FixedN3_1
-    transform = N3_1
+    transform = FixedN3_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_2
+    name = FixedN3_2
-    transform = N3_2
+    transform = FixedN3_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_3
+    name = FixedN3_3
-    transform = N3_3
+    transform = FixedN3_3
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -368,32 +372,32 @@
   // 4 cones
   NODE
   {
-    name = N4_1
+    name = FixedN4_1
-    transform = N4_1
+    transform = FixedN4_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_2
+    name = FixedN4_2
-    transform = N4_2
+    transform = FixedN4_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_3
+    name = FixedN4_3
-    transform = N4_3
+    transform = FixedN4_3
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_4
+    name = FixedN4_4
-    transform = N4_4
+    transform = FixedN4_4
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -401,48 +405,48 @@
   // 6 cones
   NODE
   {
-    name = N6_1
+    name = FixedN6_1
-    transform = N6_1
+    transform = FixedN6_1
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_2
+    name = FixedN6_2
-    transform = N6_2
+    transform = FixedN6_2
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_3
+    name = FixedN6_3
-    transform = N6_3
+    transform = FixedN6_3
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_4
+    name = FixedN6_4
-    transform = N6_4
+    transform = FixedN6_4
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_5
+    name = FixedN6_5
-    transform = N6_5
+    transform = FixedN6_5
     size=1
     method=FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_6
+    name = FixedN6_6
-    transform = N6_6
+    transform = FixedN6_6
     size=1
     method=FIXED_JOINT
     rigid = true
@@ -456,7 +460,7 @@
     {
       DisplayText = Four
       MeshTransform = 5mMountSaturnX5
-      NodePrefix = N4_
+      NodePrefix = FixedN4_
       SetCount = 4
       Symmetry = 3
     }   
@@ -464,7 +468,7 @@
     {
       DisplayText = Three
       MeshTransform = 5mMountSaturnX4
-      NodePrefix = N3_
+      NodePrefix = FixedN3_
       SetCount = 3
       Symmetry = 2
     }
@@ -472,7 +476,7 @@
     {
       DisplayText = Two
       MeshTransform = 5mMountSaturnX3
-      NodePrefix = N2_
+      NodePrefix = FixedN2_
       SetCount = 2
       Symmetry = 1
     }
@@ -480,7 +484,7 @@
     {
       DisplayText = Six
       MeshTransform = 5mMountSaturnX7
-      NodePrefix = N6_
+      NodePrefix = FixedN6_
       SetCount = 6
       Symmetry = 5
     }

Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg

@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Hatches/RS_HTCH_625
   }
+  proxy = 0, 0, 0,    0.6, 0.1, 0.6,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.6, 0.1, 0.6,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg

@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Lights/RS_LGHT_Airlock_Green
   }
+  proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg

@@ -7,6 +7,6 @@ PROP
   {
     model = ReStock/Props/Lights/RS_LGHT_Airlock_Red
   }
+  proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg

@@ -9,21 +9,21 @@ PROP
   }
 
   //MODULE
-  {
+  //{
-    name = InternalButtonLight
+  //  name = InternalButtonLight
-
+  //
-    buttonName = enable_BOXCOLLIDER
+  //  buttonName = enable_BOXCOLLIDER
-    defaultValue = true
+  //  defaultValue = true
-
+  //
-    lightName = SpotLight
+  //  lightName = SpotLight
-    lightColor = 1,1,1
+  //  lightColor = 1,1,1
-    lightIntensityOn = 0.75
+  //  lightIntensityOn = 0.75
-    lightIntensityOff = 0
+  //  lightIntensityOff = 0
-
+  //
-    useButtonColor = true
+  //  useButtonColor = true
-    buttonColorOn = 1,1,1
+  //  buttonColorOn = 1,1,1
-    buttonColorOff = 0,0,0
+  //  buttonColorOff = 0,0,0
-  }
+  //}
+  proxy = 0, 0, 0,    0.06, 0.15, 0.07,   1, 0, 0
 }
 
-proxy = 0, 0, 0,    0.06, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Versioning/ReStock.version

@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":3,
+        "PATCH":6,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":12,
-        "PATCH":2
+        "PATCH":5
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

Distribution/Restock/changelog.txt

@@ -1,3 +1,39 @@
+v1.4.6
+------
+- Fixed extra random png texture in the distribution (#1017)
+- Fixed rotation of Mk2 Lander can airlock (#1008)
+- Fixed LT-2 landing leg being weaker than stock (#858)
+
+v1.4.5
+------
+- Add drag cubes from KSP 1.12.5 Vanilla to the following parts (this should help a lot with re-entry with craft designed in Vanilla):
+  - Probodobodyne QBE
+  - Probodobodyne Stayputnik
+  - Probodobodyne HECS
+  - Probodobodyne OKTO
+  - Probodobodyne OKTO2
+  - Probodobodyne HECS2
+  - RC-L01 Remote Guidance Unit
+  - RC-001S Remote Guidance Unit
+  - R-4 'Dumpling' External Tank
+  - R-11 'Baguette' External Tank
+  - R-12 'Doughnut' External Tank
+  - Heat Shield (0.625m)
+  - OX-STAT Photovoltaic Panels
+  - OX-STAT-XL Photovoltaic Panels
+- Fix engine attachment nodes on the Making History Kerbodyne Engine Cluster Adapter Tank.
+- New stock part replacement:
+  - T-1 Toroidal Aerospike "Dart" Liquid Fuel Engine.
+
+v1.4.4
+------
+- Fixed wheelCollider on the LT-05 Micro Landing Strut
+- Fixed 1.25m, 2.5m, 3.75m and 5m Engine Plate mass values
+- Fixed top node for Mastodon 3.75m Boattail variant
+- Fixed Russian localization syntax
+- Fixed variant display names for lights
+- Tidied up various config syntax errors, thank you HebaruSan!
+
 v1.4.3
 ------
 - KSP 1.12.3

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.4.3
+RESTOCK 1.4.6
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.
@@ -13,7 +13,7 @@ DEPENDENCIES
 ============
 
 Required:
-- ModuleManager (4.2.1)
+- ModuleManager (4.2.3)
 
 =======
 CREDITS
@@ -27,6 +27,8 @@ Art
 - Passinglurker
 - Porkjet
 - riocrokite
+- Kavaeric
+- Well
 
 Drag cube wizardry
 - DMagic
@@ -50,7 +52,7 @@ To install, drag the ReStock folder and ModuleManager DLL from the GameData fold
             - Assets
             - Patches
             - etc.
-        - ModuleManager.4.2.1.dll
+        - ModuleManager.4.2.3.dll
 
 ===============
 ASSET BLACKLIST
@@ -80,7 +82,7 @@ This mod primarily uses vanilla-provided localization, but for additional string
 - German (woeller)
 - French (Challyss and vinix38)
 - Brazilian Portuguese (AluisioASG)
-- Spanish (Niako)
+- Spanish (Niako and Fitiales)
 - Simplified Chinese (Duck1998)
 - Russian (Fedor-St)
 - Japanese (Chemical-Factory)

Distribution/RestockPlus/.mod_data.yml

@@ -10,8 +10,9 @@ package:
     - license.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.2.1
+    location: url
-    location: s3
+    url: https://ksp.sarbian.com/jenkins/job/ModuleManager/163/artifact/ModuleManager.4.2.3.dll
+    zip: false
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

Distribution/RestockPlus/GameData/ReStockPlus/Localization/es-es.cfg

@@ -303,7 +303,7 @@ Localization
     #LOC_RestockPlus_restock-decoupler-1875-1_title = Desacoplador TD-18
     #LOC_RestockPlus_restock-decoupler-1875-1_description = Este desacoplador de pila es una herramienta de tamaño mediano para dividir cohetes.
     #LOC_RestockPlus_restock-decoupler-1875-1_tags = restock break decouple explo separat split
-    l
+
     #LOC_RestockPlus_restock-decoupler-1875-truss-1_title = Desacoplador de armadura TD-18T
     #LOC_RestockPlus_restock-decoupler-1875-truss-1_description = Este es un desacoplador con brocas huecas, adecuado para motores de preparación en caliente cuando divide su cohete en dos.
     #LOC_RestockPlus_restock-decoupler-1875-truss-1_tags = restock break decouple explo kerbodyne separat split

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/0625/restock-nosecone-0625-1.cfg

@@ -67,4 +67,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 205
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg

@@ -352,4 +352,9 @@ PART
     cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957
     cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1675
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg

@@ -15,7 +15,7 @@ PART
   rescaleFactor = 1
   // Attachment
   attachRules = 1,1,1,1,0
-  node_stack_bottom = 0.0, -0.94, 0, 0.0, -1.0, 0.0, 1
+  node_stack_bottom = 0.0, -0.94, 0, 0.0, -1.0, 0.0, 2
   // Tech
   TechRequired = aerodynamicSystems
   entryCost = 0

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/0625/restock-drone-core-0625-1.cfg

@@ -113,4 +113,9 @@ PART
     canBeTransferredToInVessel = True
     canTransferInVessel = True
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 80
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-1.cfg

@@ -253,6 +253,20 @@ PART
     convectionFluxThreshold = 3000
   }
   
+  MODULE
+  {
+    name = ModuleCargoPart  
+    stackableQuantity = 1
+    packedVolume = -1
+  }
+
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 1
+    packedVolumeLimit = 35
+  }
+
   DRAG_CUBE
   {
     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-2.cfg

@@ -259,6 +259,20 @@ PART
     convectionFluxThreshold = 3000
   }
 
+  MODULE
+  {
+    name = ModuleCargoPart  
+    stackableQuantity = 1
+    packedVolume = -1
+  }
+
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 1
+    packedVolumeLimit = 20
+  }
+
   DRAG_CUBE
   {
     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-3.cfg

@@ -259,6 +259,20 @@ PART
     convectionFluxThreshold = 3000
   }
 
+  MODULE
+  {
+    name = ModuleCargoPart  
+    stackableQuantity = 1
+    packedVolume = -1
+  }
+
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 1
+    packedVolumeLimit = 10
+  }
+
   DRAG_CUBE
   {
     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/1875/restock-drone-core-1875-1.cfg

@@ -113,4 +113,9 @@ PART
     canBeTransferredToInVessel = True
     canTransferInVessel = True
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1380
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/1875/restock-mk2-pod.cfg

@@ -230,4 +230,18 @@ PART
     name = FlagDecal
     textureQuadName = Flag
   }
+  
+  MODULE
+  {
+    name = ModuleCargoPart	
+    stackableQuantity = 1
+    packedVolume = -1
+  }
+
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 2
+    packedVolumeLimit = 100
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg

@@ -74,6 +74,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 300
+    packedVolume = 390
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-3.cfg

@@ -56,6 +56,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 25
+    packedVolume = 95
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2_v2.cfg

@@ -124,6 +124,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 120
+    packedVolume = 360
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg

@@ -102,4 +102,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = 2Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 20
+    stackableQuantity = 3
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg

@@ -103,4 +103,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini2Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-2.cfg

@@ -193,4 +193,9 @@ PART
       key = 0 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 80
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg

@@ -174,4 +174,10 @@ PART
       key = 0 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 6
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg

@@ -103,4 +103,9 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = 4AMask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 70
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg

@@ -103,4 +103,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini4AMask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 6
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg

@@ -103,4 +103,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini4Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 5
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg

@@ -103,4 +103,9 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = 5Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 85
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg

@@ -103,4 +103,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini5Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 8
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg

@@ -103,4 +103,9 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = 3Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 45
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg

@@ -103,4 +103,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini3Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 4
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-single-mini-1.cfg

@@ -102,4 +102,10 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = Mini1Mask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1
+    stackableQuantity = 4
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/restock-reactionwheel-1875-1.cfg

@@ -42,4 +42,9 @@ PART
       rate = 0.675
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1700
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/restock-reactionwheel-radial-1.cfg

@@ -47,6 +47,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 40
+    packedVolume = 45
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-1.cfg

@@ -162,4 +162,9 @@ PART
       key = 0 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 880
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg

@@ -72,4 +72,10 @@ PART
     name = ModuleRestockEnhancedLight
     cookiePath = ReStock/Assets/Electrical/restock-light-cookie-spot-1
   }
+  
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 250
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/125/restock-engineplate-125-2.cfg

@@ -27,7 +27,7 @@ PART
   tags = #LOC_RestockPlus_restock-engineplate-125-1_tags 
   // restock engine plate shroud boattail explo break decouple seperat split pancake 125 1.25 Electron
   attachRules = 1,0,1,1,0
-  mass = 0.0625
+  mass = 0.062
   dragModelType = default
   maximum_drag = 0.2
   minimum_drag = 0.2
@@ -369,7 +369,7 @@ PART
     VARIANT
     {
       name = Boattail-Dark
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_dark // Boattail (Dark)
       primaryColor = #4c4f47
@@ -404,7 +404,7 @@ PART
     VARIANT
     {
       name = Boattail-White
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
       primaryColor = #ffffff
@@ -439,7 +439,7 @@ PART
     VARIANT
     {
       name = Boattail-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 50
       displayName = #LOC_Restock_variant-engine_boattail_grey-orange // Boattail (Orange/Grey)
       primaryColor = #f49841
@@ -474,7 +474,7 @@ PART
     VARIANT
     {
       name = Short
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-short // Short
       primaryColor = #3a562a
@@ -509,7 +509,7 @@ PART
     VARIANT
     {
       name = Medium-Short
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short // Medium-Short
       primaryColor = #3a562a
@@ -544,7 +544,7 @@ PART
     VARIANT
     {
       name = Medium
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med // Medium
       primaryColor = #3a562a
@@ -579,7 +579,7 @@ PART
     VARIANT
     {
       name = Medium-Long
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-long // Medium-Long
       primaryColor = #3a562a
@@ -649,7 +649,7 @@ PART
     VARIANT
     {
       name = Short-Orange
-      mass = -0.02
+      mass = -0.01
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-short-alt // Short (Alternate)
       primaryColor = #f49841
@@ -684,7 +684,7 @@ PART
     VARIANT
     {
       name = Medium-Short-Orange
-      mass = -0.015
+      mass = -0.0075
       cost = 0
       displayName =  #LOC_Restock_variant-tube-length-med-short-alt // Medium-Short (Alternate)
       primaryColor = #f49841
@@ -719,7 +719,7 @@ PART
     VARIANT
     {
       name = Medium-Orange
-      mass = -0.01
+      mass = -0.005
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-alt // Medium (Alternate)
       primaryColor = #f49841
@@ -754,7 +754,7 @@ PART
     VARIANT
     {
       name = Medium-Long-Orange
-      mass = -0.005
+      mass = -0.0025
       cost = 0
       displayName = #LOC_Restock_variant-tube-length-med-long-alt // Medium-Long (Alternate)
       primaryColor = #f49841

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg

@@ -10,8 +10,8 @@ PART
     model = ReStock/Assets/Coupling/restock-decoupler-1875-1
   }
   rescaleFactor = 1.0
-  node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 1
+  node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 2
-  node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 1
+  node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 2
   TechRequired = advConstruction
   entryCost = 1800
   cost = 475
@@ -214,6 +214,11 @@ MODULE
       body = _NotSun
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1150
+  }
   DRAG_CUBE
   {
     cube = Default, 0.1988,0.7448,0.8757, 0.1988,0.7448,0.8757, 1.217,0.9952,0.1299, 1.217,0.9952,0.1299, 0.1988,0.7442,0.8871, 0.1988,0.7442,0.8871, 0,0,0, 1.25,0.16,1.25

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-truss-1.cfg

@@ -180,6 +180,11 @@ PART
       body = _NotSun
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2135
+  }
   DRAG_CUBE
   {
     cube = 0, 0.5479,0.6578,1.063, 0.5479,0.6627,1.063, 2.363,0.7644,0.7397, 2.363,0.7599,0.5773, 0.5479,0.7109,1.063, 0.5479,0.7101,1.063, 0,0.00108,0, 1.917,0.5397,1.917

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg

@@ -10,8 +10,8 @@ PART
     model = ReStock/Assets/Coupling/restock-separator-1875-1
   }
   rescaleFactor = 1.0
-  node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 1
+  node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 2
-  node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 1
+  node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 2
   TechRequired = advConstruction
   entryCost = 1800
   cost = 475
@@ -213,6 +213,11 @@ PART
       body = _NotSun
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1145
+  }
   DRAG_CUBE
   {
     cube = Default, 0.1988,0.7448,0.8757, 0.1988,0.7448,0.8757, 1.217,0.9952,0.1299, 1.217,0.9952,0.1299, 0.1988,0.7442,0.8871, 0.1988,0.7442,0.8871, 0,0,0, 1.25,0.16,1.25

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/25/restock-engineplate-25-1.cfg

@@ -30,7 +30,7 @@ PART
   tags = #LOC_RestockPlus_restock-engineplate-25-1_tags 
   // restock engine plate shroud boattail explo break decouple seperat split pancake 25 2.5 Falcon
   attachRules = 1,0,1,1,0
-  mass = 0.10
+  mass = 0.25
   dragModelType = default
   maximum_drag = 0.2
   minimum_drag = 0.2

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/375/restock-engineplate-375-1.cfg

@@ -30,7 +30,7 @@ PART
   tags = #LOC_RestockPlus_restock-engineplate-375-1_tags 
   // restock engine plate shroud boattail explo break decouple seperat split pancake 375 3.75 Zenit
   attachRules = 1,0,1,1,0
-  mass = 0.10
+  mass = 0.58
   dragModelType = default
   maximum_drag = 0.2
   minimum_drag = 0.2

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/5/restock-engineplate-5-1.cfg

@@ -30,7 +30,7 @@ PART
   tags = #LOC_RestockPlus_restock-engineplate-5-1_tags 
   // restock engine plate shroud boattail explo break decouple seperat split pancake 5 Ares V
   attachRules = 1,0,1,1,0
-  mass = 0.10
+  mass = 1.0
   dragModelType = default
   maximum_drag = 0.2
   minimum_drag = 0.2

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/radial/restock-decoupler-radial-tiny-1.cfg

@@ -147,4 +147,9 @@ PART
       body = _NotSun
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 100
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/1875/restock-battery-1875-1.cfg

@@ -15,8 +15,8 @@ PART
   scale = 1.0
   rescaleFactor = 1
   // --- node definitions ---
-  node_stack_top = 0.0, 0.10818, 0.0, 0.0, 1.0, 0.0, 1
+  node_stack_top = 0.0, 0.10818, 0.0, 0.0, 1.0, 0.0, 2
-  node_stack_bottom = 0.0, -0.1084, 0.0, 0.0, -1.0, 0.0, 1
+  node_stack_bottom = 0.0, -0.1084, 0.0, 0.0, -1.0, 0.0, 2
   // --- editor parameters ---
   TechRequired = largeElectrics
   entryCost = 12125
@@ -45,4 +45,9 @@ PART
     amount = 2500
     maxAmount = 2500
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 860
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/radial/restock-apu-radial-1.cfg

@@ -71,6 +71,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 75
+    packedVolume = 85
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-les-2.cfg

@@ -197,4 +197,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1975
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg

@@ -658,6 +658,11 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 405
+  }
   // You might work with remodeling but not yet
   //MODULE
   //{

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg

@@ -434,4 +434,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1605
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg

@@ -541,4 +541,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 980
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg

@@ -707,4 +707,9 @@ PART
       key = 1 1
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2750
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-galleon.cfg

@@ -480,7 +480,7 @@ PART
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
@@ -674,7 +674,7 @@ PART
       }
       NODES
       {
-        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.177279, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.54, 0.0, 0.0, -1.0, 0.0, 2
       }
     }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/radial/restock-engine-panda.cfg

@@ -453,4 +453,9 @@ PART
     name = ModuleRestockDepthMask
     maskTransform = WideMask
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 360
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg

@@ -89,4 +89,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 140
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg

@@ -83,4 +83,9 @@ PART
     amount = 79.2
     maxAmount = 79.2
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1875
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg

@@ -83,4 +83,9 @@ PART
     amount = 39.6
     maxAmount = 39.6
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 615
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg

@@ -83,4 +83,9 @@ PART
     amount = 19.8
     maxAmount = 19.8
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 315
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-4.cfg

@@ -83,4 +83,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 180
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-probe-1.cfg

@@ -51,4 +51,9 @@ PART
     amount = 4.95
     maxAmount = 4.95
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 65
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-probe-2.cfg

@@ -51,4 +51,9 @@ PART
     amount = 2.475
     maxAmount = 2.475
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 30
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg

@@ -123,4 +123,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1125
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-1875-4.cfg

@@ -96,4 +96,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2135
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-adapter-1875-125-2.cfg

@@ -95,4 +95,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2080
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/5/restock-fueltank-saturn-engine-1.cfg

@@ -11,6 +11,10 @@ PART
     model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1
   }
   MODEL
+  {
+    model = ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-2
+  }
+  MODEL
   {
     model = ReStock/Assets/FuelTank/restock-endcap-5-2
     position = 0.0, 1.25, 0.0
@@ -19,120 +23,120 @@ PART
   }
   NODE
   {
-    name = N2_1
+    name = FixedN2_1
-    transform = N2_1
+    transform = FixedN2_1
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N2_2
+    name = FixedN2_2
-    transform = N2_2
+    transform = FixedN2_2
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_1
+    name = FixedN3_1
-    transform = N3_1
+    transform = FixedN3_1
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_2
+    name = FixedN3_2
-    transform = N3_2
+    transform = FixedN3_2
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N3_3
+    name = FixedN3_3
-    transform = N3_3
+    transform = FixedN3_3
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_1
+    name = FixedN4_1
-    transform = N4_1
+    transform = FixedN4_1
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_2
+    name = FixedN4_2
-    transform = N4_2
+    transform = FixedN4_2
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_3
+    name = FixedN4_3
-    transform = N4_3
+    transform = FixedN4_3
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N4_4
+    name = FixedN4_4
-    transform = N4_4
+    transform = FixedN4_4
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_1
+    name = FixedN6_1
-    transform = N6_1
+    transform = FixedN6_1
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_2
+    name = FixedN6_2
-    transform = N6_2
+    transform = FixedN6_2
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_3
+    name = FixedN6_3
-    transform = N6_3
+    transform = FixedN6_3
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_4
+    name = FixedN6_4
-    transform = N6_4
+    transform = FixedN6_4
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_5
+    name = FixedN6_5
-    transform = N6_5
+    transform = FixedN6_5
     size = 1
     method = FIXED_JOINT
     rigid = true
   }
   NODE
   {
-    name = N6_6
+    name = FixedN6_6
-    transform = N6_6
+    transform = FixedN6_6
     size = 1
     method = FIXED_JOINT
     rigid = true
@@ -182,7 +186,7 @@ PART
     {
       DisplayText = Four
       MeshTransform = 5mMountSaturnX5
-      NodePrefix = N4_
+      NodePrefix = FixedN4_
       SetCount = 4
       Symmetry = 3
     }
@@ -190,7 +194,7 @@ PART
     {
       DisplayText = Three
       MeshTransform = 5mMountSaturnX4
-      NodePrefix = N3_
+      NodePrefix = FixedN3_
       SetCount = 3
       Symmetry = 2
     }
@@ -198,7 +202,7 @@ PART
     {
       DisplayText = Two
       MeshTransform = 5mMountSaturnX3
-      NodePrefix = N2_
+      NodePrefix = FixedN2_
       SetCount = 2
       Symmetry = 1
     }
@@ -206,7 +210,7 @@ PART
     {
       DisplayText = Six
       MeshTransform = 5mMountSaturnX7
-      NodePrefix = N6_
+      NodePrefix = FixedN6_
       SetCount = 6
       Symmetry = 5
     }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/radial/restock-fuel-tank-rcs-radial-tiny-1.cfg

@@ -45,4 +45,9 @@ PART
     amount = 7.5
     maxAmount = 7.5
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 70
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg

@@ -180,6 +180,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 125
+    packedVolume = 115
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg

@@ -244,6 +244,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 250
+    packedVolume = 275
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg

@@ -186,4 +186,10 @@
       key = 0 1
     }
   }
+  
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1125
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-goocanister-625-1.cfg

@@ -62,9 +62,10 @@ PART
     usageReqMaskInternal = 1
     usageReqMaskExternal = 8
   }
+  
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 75
+    packedVolume = 260
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg

@@ -102,6 +102,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 1200
+    packedVolume = 1620
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-sciencebox-stack-1.cfg

@@ -61,6 +61,6 @@ PART
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 500
+    packedVolume = 850
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/125/restock-structural-tube-125-1.cfg

@@ -425,4 +425,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1180
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/1875/restock-adapter-1875-125-1.cfg

@@ -103,4 +103,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 740
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/1875/restock-adapter-1875-25-1.cfg

@@ -103,4 +103,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 1685
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/1875/restock-node-1875-1.cfg

@@ -33,7 +33,6 @@ PART
   // affix anchor mount secure restock
   bulkheadProfiles = size1p5, srf
 
-
   // Parameters
   mass = 0.08
   dragModelType = default
@@ -44,9 +43,10 @@ PART
   maxTemp = 2000
   breakingForce = 350
   breakingTorque = 350
+  
   MODULE
   {
     name = ModuleCargoPart
-    packedVolume = 500
+    packedVolume = 2250
   }
 }