Merge pull request #998 from PorktoberRevolution/master

v1.4.4 Release PR

.github/workflows/deploy.yml

@@ -44,4 +44,6 @@ jobs:
     - name: Staging package
       run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script
     - name: Deploying Restock
-      run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github
+      run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github
+    - name: Deploying RestockPlus
+      run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github

.gitignore

@@ -13,3 +13,4 @@ Distribution/Restock/GameData/ReStock/Spaces/**/*.png
 Distribution/Restock/GameData/ReStock/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg

Distribution/Restock/.mod_data.yml

@@ -13,8 +13,9 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
+    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/Aerodynamic/restock-aero-25.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to 2.5m aerodynamic parts
 // Contents:
 // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2)
+// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v3)
 
 // Protective Rocket Nose Cone Mk7
 @PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -62,3 +63,64 @@
     }
   }
 }
+
+// Protective Rocket Nose Cone Mk7 [1.12]
+@PART[rocketNoseCone_v3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-nosecone-25-2
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = true
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = true
+        25mNoseconeWhite = false
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = false
+        25mNoseconeOrange = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg

@@ -112,4 +112,9 @@
     @animationName = Deploy
     @pivotName = Dish
   }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg

@@ -185,7 +185,6 @@
 // RV-1X RCS Thruster Block
 @PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
-
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
@@ -558,6 +557,38 @@
       key = 0 1
     }
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Bare    
+    useMultipleDragCubes = true
+    VARIANT
+    {
+      name = Bare
+      displayName =  #autoLOC_8007115
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = true
+        MiniRCSBlock2 = false
+      }
+    }   
+    VARIANT
+    {
+      name = Shroud
+      displayName = #autoLOC_8007114
+      primaryColor = #999999
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = false
+        MiniRCSBlock2 = true
+
+      }
+    }
+  }
   @MODULE[ModuleRCSFX]
   {
     @thrusterTransformName = RCSthruster

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to crewed utility/science parts
 // Contents:
 // - Inline Clamp-O-Tron (dockingPortLateral)
+// - Mk2 Clamp-O-Tron (mk2DockingPort)
 // - Clamp-O-Tron Jr. Docking Port (dockingPort3)
 // - Clamp-O-Tron Docking Port (dockingPort2)
 // - Clamp-O-Tron Sr. Docking Port (dockingPortLarge)
@@ -8,16 +9,39 @@
 
 // Inline Clamp-O-Tron
 @PART[dockingPortLateral]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
-{
+{ 
-  @author = Passinglurker
+  @author = Passinglurker and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1
+    model = ReStock/Assets/Coupling/restock-docking-inline-125-1
   }
   %rescaleFactor = 1
   %manufacturer = #autoLOC_501624
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
+}
+
+// Mk2 Clamp-O-Tron
+@PART[mk2DockingPort]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-docking-inline-mk2-1
+  }
+  %rescaleFactor = 1
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
 }
 
 // Clamp-O-Tron Jr. Docking Port
@@ -28,7 +52,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-0625
+    model = ReStock/Assets/Coupling/restock-docking-0625-2
   }
   %rescaleFactor = 1
   MODULE
@@ -76,7 +100,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-125-1
+    model = ReStock/Assets/Coupling/restock-docking-125-2
   }
   MODEL
   {
@@ -86,41 +110,7 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
-  MODULE
+ 
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
 }
 
 // Clamp-O-Tron Sr. Docking Port
@@ -131,7 +121,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-25-1
+    model = ReStock/Assets/Coupling/restock-docking-25-3
   }
   MODEL
   {
@@ -141,40 +131,39 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
-    name = ModuleColorChanger
+    name = ModulePartVariants
-    shaderProperty = _EmissiveColor
+    baseVariant = Gray with Stripes
-    animRate = 0.8
+    useMultipleDragCubes = false
-    animState = false
+    VARIANT
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
     {
-      key = 0 0 0 3
+      name = Gray with Stripes
-      key = 1 1 0 0
+      displayName = #autoLOC_8320084
+      themeName = Gray
+      primaryColor = #999999
+      themeName = Gray with Stripes
+      secondaryColor = #b08b39
+      GAMEOBJECTS
+      {
+        Docking25Base = true
+        Docking25Grey = false
+      }
     }
-    greenCurve
+    VARIANT
     {
-      key = 0 0 0 1
+      name = Gray
-      key = 1 1 1 0
+      displayName = #autoLOC_8007101
-    }
+      themeName = Gray
-    blueCurve
+      primaryColor = #999999
-    {
+      secondaryColor = #999999
-      key = 0 0 0 0
+      GAMEOBJECTS
-      key = 1 0.7 1.5 0
+      {
-    }
+        Docking25Base = false
-    alphaCurve
+        Docking25Grey = true
-    {
+      }
-      key = 0 1
+    }   
-    }
   }
 }
 
@@ -186,7 +175,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-shielded-125-1
+    model = ReStock/Assets/Coupling/restock-docking-shielded-125-2
   }
   MODEL
   {
@@ -200,41 +189,7 @@
   {
     @animationName = PortExtend
   }
-  MODULE
+  
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
   MODULE
   {
     name = FXModuleLookAtConstraint

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
@@ -128,6 +127,127 @@
   } 
 }
 
+// Illuminator Mk1 V2
+@PART[spotLight1_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-spot-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = SpotLightLens
+    @lightName = Spot
+    movementTransformName = SpotLightBase
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+// Illuminator Mk2 V2
+@PART[spotLight2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-flood-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = FloodLightLens
+    @lightName = Spot
+    movementTransformName = FloodR
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+
 // [1.11] Dome Light
 @PART[domeLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
@@ -156,7 +276,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -226,7 +346,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -295,7 +415,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -364,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

@@ -7,6 +7,11 @@
 // - Gigantor XL Solar Array (largeSolarPanel)
 // - OX-STAT Photovoltaic Panels (solarPanels5)
 // - OX-STAT-XL Photovoltaic Panels (LgRadialSolarPanel)
+// - OX-10C Photovoltaic Panels (solarPanelOX10C)
+// - SP-10C Photovoltaic Panels (solarPanelSP10C)
+// - OX-10L Photovoltaic Panels (solarPanelOX10L)
+// - SP-10L Photovoltaic Panels (solarPanelSP10C)
+
 
 // OX-4L 1x6 Photovoltaic Panels
 @PART[solarPanels4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -111,11 +116,21 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor
+    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+    transformName = PanelTruss
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @breakName = pivotBase
+  }
 }
 
 // OX-STAT Photovoltaic Panels
@@ -147,3 +162,97 @@
     rotation = 0, 0, 0
   }
 }
+
+// OX-10C Photovoltaic Panels
+@PART[solarPanelOX10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+    { 
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+}
+
+// SP-10C Photovoltaic Panels
+@PART[solarPanelSP10C]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+}
+
+// OX-10L Photovoltaic Panels
+@PART[solarPanelOX10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-ox-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+}
+
+// SP-10L Photovoltaic Panels
+@PART[solarPanelSP10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-sp-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = mask
+  }
+}

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

@@ -3,8 +3,8 @@
 // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine)
 // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME)
 // - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2)
-// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
+// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
-// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+// - 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
 
@@ -904,14 +904,14 @@
 }
 
 // LV-T30 "Reliant" Liquid Fuel Engine
-@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-reliant-1
+    model = ReStock/Assets/Engine/restock-engine-reliant-2
   }
   %rescaleFactor = 1
   @scale = 1
@@ -1021,16 +1021,17 @@
     }
   }
   @bulkheadProfiles = srf, size1
-  %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1
+
-  @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0
+  %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+ 
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1051,7 +1052,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1072,7 +1073,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1155,6 +1156,10 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
@@ -1245,20 +1250,18 @@
 }
 
 // LV-T45 "Swivel" Liquid Fuel Engine
-@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-swivel-1
+    model = ReStock/Assets/Engine/restock-engine-swivel-2
   }
   @bulkheadProfiles = srf, size1
-  rescaleFactor = 1.0
+  %rescaleFactor = 1.0
-  @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0
-  %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1
   @attachRules = 1,1,1,0,0
   !DRAG_CUBE {}
   DRAG_CUBE
@@ -1275,6 +1278,8 @@
   !sound_rocket_hard = DELETE
   !sound_vent_soft = DELETE
   !sound_explosion_low = DELETE
+
+  !MODULE[ModulePartVariants] {}
   EFFECTS
   {
     engage
@@ -1351,18 +1356,23 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-swivel-running
   }
+
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1389,7 +1399,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1416,7 +1426,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1534,6 +1544,7 @@
     gimbalResponseSpeed = 8
     useGimbalResponseSpeed = true
   }
+  !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {
     name = FXModuleLookAtConstraint

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/Ground/restock-wheels.cfg

@@ -115,7 +115,7 @@
     @damagedTransformName = WheelBusted
     @undamagedTransformName = Wheel
   }
-  !MODULE[FXModuleLookAtConstraint]
+  !MODULE[FXModuleLookAtConstraint]{}
   MODULE
   {
     name = ModuleRestockConstraints