Merge pull request #952 from PorktoberRevolution/master

Release 1.3.2

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+name: Package Checks
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the prod branch
+on:
+  pull_request:
+    branches: [ prod ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building Restock package
+      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"
+    - name: Building Restock+ package
+      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"

.github/workflows/deploy.yml

@@ -0,0 +1,49 @@
+name: Package and Deploy
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the prod branch
+on:
+  push:
+    branches: [ prod ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    - name: Building Restock
+      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"  
+    - name: Building RestockPlus
+      run: python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  
+    - 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/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

@@ -7,6 +7,7 @@ build-deploy/
 bin/
 obj/
 *.swp
+**/@thumbs
 
 Distribution/Restock/GameData/ReStock/Spaces/**/*.png
 Distribution/Restock/GameData/ReStock/Props/**/*.png

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Assets/CineboxAndrew"]
-	path = Assets/CineboxAndrew
-	url = https://github.com/drewcassidy/ReStocked-Assets.git

.travis.yml

@@ -1,51 +0,0 @@
-language: python
-python:
-  - 3.6
-install:
-  - pip install awscli boto3 requests
-branches:
-  only:
-    - prod
-script:
-  - git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git  # clone this repo, it contains the stuff that does the heavy lifting
-  - cd build-deploy
-  - git checkout master
-  - cd ..
-  - pytest -s --testpath "Distribution/" build-deploy/src/tests/  # run the deploy tests
-  - python build-deploy/src/package.py  --f "Distribution/Restock/.mod_data.yml"  # Build RS package
-  - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  # Build RS+ package
-before_deploy:
-  - python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script. Note that tags will come off restock base always
-deploy:
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy RS package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml"  # Deploy RS+ package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - provider: s3 # releases to S3
-    access_key_id: $AWS_ACCESS_KEY_ID
-    secret_access_key: $AWS_SECRET_ACCESS_KEY
-    bucket: "nertea-ksp-modding-releases"
-    local_dir: deploy/ReStock
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restock
-    on:
-      branch: prod
-  - provider: s3 # releases to S3
-    access_key_id: $AWS_ACCESS_KEY_ID
-    secret_access_key: $AWS_SECRET_ACCESS_KEY
-    bucket: "nertea-ksp-modding-releases"
-    local_dir: deploy/ReStockPlus
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restockplus
-    on:
-      branch: prod

Distribution/Restock/.mod_data.yml

@@ -13,7 +13,7 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.3
+    version: 4.1.4
     location: s3
 deploy:
   SpaceDock:

Distribution/Restock/GameData/ReStock/Localization/fr-fr.cfg

@@ -1,10 +1,12 @@
+// Courtesy of Challyss of the KSP forums.
+// Additional translation by vinix38.
+//
 // Proposed format:
 //   #LOC_Restock_partconfigname_fieldname
 // eg.
 //   #LOC_Restock_restock-engine-375-3_title = ...
 //   #LOC_Restock_restock-engine-375-3_description = ...
-// Courtesy of Challyss of the KSP forums
-// additionnal translation by vinix38
+
 Localization
 {
   fr-fr
@@ -45,6 +47,18 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Caréné (1.875m, Orange/Gris)
     #LOC_Restock_variant-engine_tankbutt_size2_white = Fond de réservoir (2.5m, Blanc)
     #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Fond de réservoir (2.5m, Orange/Gris)
+    #LOC_Restock_variant-engine_singlebell_compact = Unique Compact
+    #LOC_Restock_variant-engine_singlebell_compact_white = Unique Compact (Enveloppe blanche)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Unique Compact (Enveloppe Orange/Grise)
+    #LOC_Restock_variant-engine_singlebell = Unique    
+    #LOC_Restock_variant-engine_singlebell_white = Unique (Enveloppe blanche)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = Unique (Enveloppe Orange/Grise)
+    #LOC_Restock_variant-engine_quadbell = Quatre 
+    #LOC_Restock_variant-engine_quadbell_white = Quatre (Enveloppe blanche)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = Quatre (Enveloppe Orange/Grise)
+    #LOC_Restock_variant-engine_quadbell_compact = Quatre Compact
+    #LOC_Restock_variant-engine_quadbell_compact_white = Quatre Compact (Enveloppe blanche)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = Quatre Compact (Enveloppe Orange/Grise)
 
     #LOC_Restock_variant-engine_boattail_size2_white = Caréné (2.5m, Blanc)
     #LOC_Restock_variant-engine_boattail_size2_grey-orange = Caréné (2.5m, Orange/Gris)
@@ -63,6 +77,7 @@ Localization
     #LOC_Restock_variant-mounting_classic_grey-orange = Classique (Enveloppe Orange/Grise)
     #LOC_Restock_variant-mounting_truss = Treillis
     #LOC_Restock_variant-mounting_compact = Compact
+    #LOC_Restock_variant-mounting_mounted = Support
 
     #LOC_Restock_variant-gold-truss = Doré (Support)
     #LOC_Restock_variant-silver-truss = Argenté (Support)
@@ -82,23 +97,38 @@ Localization
     #LOC_Restock_variant-telescope_shielded = Protégé
     #LOC_Restock_variant-telescope_bare = Nu
 
+    #LOC_Restock_variant-pod_bare = Nu
+    #LOC_Restock_variant-pod_fabric_green = Cache vert
+    #LOC_Restock_variant-pod_fabric_beige = Cache beige
+    #LOC_Restock_variant-pod_fabric_white = Cache blanc
+
     #LOC_Restock_variant-wheel_broken = Cassée
     #LOC_Restock_variant-wheel_bare = Nue
 
     #LOC_Restock_variant-surface_metal = Métal
     #LOC_Restock_variant-surface_basic = Basique
     #LOC_Restock_variant-surface_truss = Treillis
+    #LOC_Restock_variant-surface_warningStripes = bandes d'avertissement
     #LOC_Restock_variant-surface_thermalblankets = Isolé
-
-    #LOC_Restock_variant-decoupler_metal = Métal
-    #LOC_Restock_variant-decoupler_grey-orange = Orange/Gris
-
     #LOC_Restock_variant-surface_yellow = Jaune
     #LOC_Restock_variant-surface_black = Noir
+    #LOC_Restock_variant-surface_white = Blanc
+    #LOC_Restock_variant-surface_blue = Bleu
+
+    #LOC_Restock_variant-strut_classic_metal = Métal
+    #LOC_Restock_variant-strut_classic_white = Blanc
+    #LOC_Restock_variant-strut_compact_metal = Métal (Compact)
+    #LOC_Restock_variant-strut_compact_white = Blanc (Compact)
+    
+    #LOC_Restock_variant-decoupler_metal = Métal
+    #LOC_Restock_variant-decoupler_grey-orange = Orange/Gris
 
     #LOC_Restock_variant-service-bay-opaque = Bases pleines
     #LOC_Restock_variant-service-bay-transparent = Bases treillis
     #LOC_Restock_variant-service-bay-hollow = Bases vides
+    #LOC_Restock_variant-service-bay-open = Ouverte
+    #LOC_Restock_variant-service-bay-tunnel = Tunnel d'amarrage
+    #LOC_Restock_variant-service-bay-shelves = Etagères
 
     #LOC_Restock_variant-heat-shield-black = Noir
     #LOC_Restock_variant-heat-shield-brown = Classique

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

@@ -0,0 +1,161 @@
+//提案されたフォーマット:
+//   #LOC_Restock_partconfigname_fieldname
+//例:
+//   #LOC_Restock_restock-engine-375-3_title = ...
+//   #LOC_Restock_restock-engine-375-3_description = ...
+
+Localization
+{
+  ja
+  {
+    //アクションとボタン
+    #LOC_Restock_scanner_screen_on = スクリーンオン
+    #LOC_Restock_scanner_screen_off = スクリーンオフ
+    #LOC_Restock_scanner_screen_toggle = スクリーン切り替え
+
+    #LOC_Restock_variant-engine_size0 = 0.625m
+    #LOC_Restock_variant-engine_size0_white = 0.625m（ホワイト）
+    #LOC_Restock_variant-engine_size0_grey-orange = 0.625m（オレンジ/グレー）
+    #LOC_Restock_variant-engine_size1 = 1.25m
+    #LOC_Restock_variant-engine_size1_white = 1.25m（ホワイト）
+    #LOC_Restock_variant-engine_size1_grey-orange = 1.25m（オレンジ/グレー）
+    #LOC_Restock_variant-engine_size1p5 = 1.875m
+    #LOC_Restock_variant-engine_size1p5_white = 1.875m（ホワイト）
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m（オレンジ/グレー）
+    #LOC_Restock_variant-engine_size2 = 2.5m
+    #LOC_Restock_variant-engine_size2_white = 2.5m（ホワイト）
+    #LOC_Restock_variant-engine_size2_grey-orange = 2.5m（オレンジ/グレー）
+    #LOC_Restock_variant-engine_size3 = 3.75m
+    #LOC_Restock_variant-engine_compact = コンパクト
+    #LOC_Restock_variant-engine_compact_white = コンパクト（ホワイト）
+    #LOC_Restock_variant-engine_compact_grey-orange = コンパクト（オレンジ/グレー）
+    #LOC_Restock_variant-engine_radial = ラジアル
+    #LOC_Restock_variant-engine_boattail = ボートテール
+    #LOC_Restock_variant-engine_boattail_white = ボートテール（ホワイト）
+    #LOC_Restock_variant-engine_boattail_grey-orange = ボートテール（オレンジ/グレー）
+    #LOC_Restock_variant-engine_boattail_orange = ボートテール（オレンジ）
+    #LOC_Restock_variant-engine_boattail_metal = ボートテール（メタル）
+    #LOC_Restock_variant-engine_boattail_dark = ボートテール（ダーク）
+    #LOC_Restock_variant-engine_boattail_size1 = ボートテール（1.25m）
+    #LOC_Restock_variant-engine_boattail_size1p5 = ボートテール（1.875m）
+    #LOC_Restock_variant-engine_boattail_size1_white = ボートテール（1.25m、ホワイト）
+    #LOC_Restock_variant-engine_boattail_size1p5_white = ボートテール（1.875m、ホワイト）
+    #LOC_Restock_variant-engine_boattail_size1_grey-orange = ボートテール（1.25m、オレンジ/グレー）
+    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = ボートテール（1.875m、オレンジ/グレー）
+    #LOC_Restock_variant-engine_tankbutt_size2_white = タンク下部（2.5m、ホワイト）
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = タンク下部 （2.5m、オレンジ/グレー）
+    #LOC_Restock_variant-engine_singlebell_compact = シングルコンパクト
+    #LOC_Restock_variant-engine_singlebell_compact_white = シングルコンパクト（ホワイト）
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = シングルコンパクト（オレンジ/グレー）
+    #LOC_Restock_variant-engine_singlebell = シングル
+    #LOC_Restock_variant-engine_singlebell_white = シングル（ホワイト）
+    #LOC_Restock_variant-engine_singlebell_grey-orange = シングル （オレンジ/グレー）
+    #LOC_Restock_variant-engine_quadbell = クアッド
+    #LOC_Restock_variant-engine_quadbell_white = クアッド （ホワイト）
+    #LOC_Restock_variant-engine_quadbell_grey-orange = クアッド （オレンジ/グレー）
+    #LOC_Restock_variant-engine_quadbell_compact = クアッドコンパクト
+    #LOC_Restock_variant-engine_quadbell_compact_white = クアッドコンパクト（ホワイト）
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = クアッドコンパクト（オレンジ/グレー）
+
+    #LOC_Restock_variant-engine_boattail_size2_white = ボートテール（2.5m、ホワイト）
+    #LOC_Restock_variant-engine_boattail_size2_grey-orange = ボートテール（2.5m、オレンジ/グレー）
+    #LOC_Restock_variant-engine_boattail_size3_white = ボートテール（3.75m、ホワイト）
+    #LOC_Restock_variant-engine_boattail_size3_grey-orange = ボートテール（3.75m、オレンジ/グレー）
+
+    #LOC_Restock_variant-engine_shroud_white = ホワイト
+    #LOC_Restock_variant-engine_shroud_grey-orange = オレンジ/グレー
+
+    #LOC_Restock_variant-engine_shroud = シュラウド
+    #LOC_Restock_variant-engine_shroud_wide = ワイドシュラウド
+    #LOC_Restock_variant-engine_docking = ドッキングポート
+
+    #LOC_Restock_variant-mounting_classic = クラシック
+    #LOC_Restock_variant-mounting_classic_white = クラシック（ホワイト）
+    #LOC_Restock_variant-mounting_classic_grey-orange = クラシック（オレンジ/グレー）
+    #LOC_Restock_variant-mounting_truss = トラス
+    #LOC_Restock_variant-mounting_compact = コンパクト
+    #LOC_Restock_variant-mounting_mounted = マウント
+
+    #LOC_Restock_variant-gold-truss = ゴールド
+    #LOC_Restock_variant-silver-truss = シルバー
+
+    #LOC_Restock_variant-engine_pod-orange = オレンジ
+    #LOC_Restock_variant-engine_pod-gray = グレー
+
+    #LOC_Restock_variant-antenna_size0 = 0.625m
+    #LOC_Restock_variant-antenna_size1 = 1.25m
+    #LOC_Restock_variant-antenna_truss = トラス
+    #LOC_Restock_variant-antenna_compact = コンパクト
+    #LOC_Restock_variant-antenna_radial = ラジアル
+    #LOC_Restock_variant-antenna_radial_reverse = ラジアル （反転）
+    #LOC_Restock_variant-antenna_axial = アキシャル
+    #LOC_Restock_variant-antenna_axial_reverse = アキシャル （反転）
+
+    #LOC_Restock_variant-telescope_shielded = シールド
+    #LOC_Restock_variant-telescope_bare = ベア
+
+    #LOC_Restock_variant-pod_bare = ベア
+    #LOC_Restock_variant-pod_fabric_green = グリーン・パディング
+    #LOC_Restock_variant-pod_fabric_beige = ベージュ・パディング
+    #LOC_Restock_variant-pod_fabric_white = ホワイト
+
+    #LOC_Restock_variant-wheel_broken = ブロークン
+    #LOC_Restock_variant-wheel_bare = ベア
+
+    #LOC_Restock_variant-surface_metal = メタル
+    #LOC_Restock_variant-surface_basic = ベーシック
+    #LOC_Restock_variant-surface_truss = トラス
+    #LOC_Restock_variant-surface_warningStripes = 警告ストライプ
+    #LOC_Restock_variant-surface_thermalblankets = サーマルブランケット
+    #LOC_Restock_variant-surface_yellow = イエロー
+    #LOC_Restock_variant-surface_black = ブラック
+    #LOC_Restock_variant-surface_white = ホワイト
+    #LOC_Restock_variant-surface_blue = ブルー
+
+    #LOC_Restock_variant-strut_classic_metal = メタル
+    #LOC_Restock_variant-strut_classic_white = ホワイト
+    #LOC_Restock_variant-strut_compact_metal = メタル（コンパクト）
+    #LOC_Restock_variant-strut_compact_white = ホワイト（コンパクト）
+    
+    #LOC_Restock_variant-decoupler_metal = メタル
+    #LOC_Restock_variant-decoupler_grey-orange = オレンジ/グレー
+
+    #LOC_Restock_variant-service-bay-opaque = ソリッドキャップ
+    #LOC_Restock_variant-service-bay-transparent = トラスキャップ
+    #LOC_Restock_variant-service-bay-hollow = キャップなし
+    #LOC_Restock_variant-service-bay-open = オープン
+    #LOC_Restock_variant-service-bay-tunnel = ドッキングトンネル
+    #LOC_Restock_variant-service-bay-shelves = シェルフ
+
+    #LOC_Restock_variant-heat-shield-black = ブラック
+    #LOC_Restock_variant-heat-shield-brown = クラシック
+    #LOC_Restock_variant-heat-shield-red = 塗装なし
+
+    #LOC_Restock_variant-linear-rcs-pod = ポッド
+    #LOC_Restock_variant-linear-rcs-bare = ベア
+
+    #LOC_Restock_variant-stayputnik-pod = マウントあり
+    #LOC_Restock_variant-stayputnik-bare = マウントなし
+    #LOC_Restock_variant-probe-gold = ゴールド
+    #LOC_Restock_variant-probe-silver = シルバー
+    #LOC_Restock_variant-probe-bare = ベーシック
+
+    #LOC_Restock_variant-radiator_basic = ベーシック
+    #LOC_Restock_variant-radiator_flat = フラット
+    #LOC_Restock_variant-radiator_compact = コンパクト
+
+    #LOC_Restock_variant-tube-length-short = ショート
+    #LOC_Restock_variant-tube-length-med-short = ミディアムショート
+    #LOC_Restock_variant-tube-length-med = ミディアム
+    #LOC_Restock_variant-tube-length-med-long = ミディアムロング
+    #LOC_Restock_variant-tube-length-long = ロング
+
+    #LOC_Restock_variant-tube-length-short-alt = ショート（代替）
+    #LOC_Restock_variant-tube-length-med-short-alt = ミディアムショート（代替）
+    #LOC_Restock_variant-tube-length-med-alt = ミディアム（代替）
+    #LOC_Restock_variant-tube-length-med-long-alt = ミディアムロング（代替）
+    #LOC_Restock_variant-tube-length-long-alt = ロング（代替）
+
+    #LOC_Restock_description-FuelCellArray = 大きな燃料電池が1つあるのに、なぜ小さな燃料電池が3つあるのでしょうか。 この燃料電池アレイは、大容量の電源が必要な状況を対象としています。 小型燃料電池と同様に、このアレイは液体燃料と酸化剤をエネルギーに変換します。
+  }
+}

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

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

Distribution/Restock/GameData/ReStock/Localization/zh-cn.cfg

@@ -8,104 +8,154 @@ Localization
 {
   zh-cn
   {
-
     // Actions and buttons
-    #LOC_Restock_scanner_screen_on = 打开屏幕
+    #LOC_Restock_scanner_screen_on = 开启屏幕
     #LOC_Restock_scanner_screen_off = 关闭屏幕
     #LOC_Restock_scanner_screen_toggle = 开关屏幕
 
     #LOC_Restock_variant-engine_size0 = 0.625m
-    #LOC_Restock_variant-engine_size0_white = 0.625m(白色外壳)
-    #LOC_Restock_variant-engine_size0_grey-orange = 0.625m(灰色和橙色外壳)
+    #LOC_Restock_variant-engine_size0_white = 0.625m (白色外壳)
+    #LOC_Restock_variant-engine_size0_grey-orange = 0.625m (灰色和橙色外壳)
     #LOC_Restock_variant-engine_size1 = 1.25m
-    #LOC_Restock_variant-engine_size1_white = 1.25m(白色外壳)
-    #LOC_Restock_variant-engine_size1_grey-orange = 1.25m(灰色和橙色外壳)
+    #LOC_Restock_variant-engine_size1_white = 1.25m (白色外壳)
+    #LOC_Restock_variant-engine_size1_grey-orange = 1.25m (灰色和橙色外壳)
     #LOC_Restock_variant-engine_size1p5 = 1.875m
-    #LOC_Restock_variant-engine_size1p5_white = 1.875m(白色外壳)
-    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m(灰色和橙色外壳)
+    #LOC_Restock_variant-engine_size1p5_white = 1.875m (白色外壳)
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m (灰色和橙色外壳)
     #LOC_Restock_variant-engine_size2 = 2.5m
-    #LOC_Restock_variant-engine_size2_white = 2.5m(白色外壳)
-    #LOC_Restock_variant-engine_size2_grey-orange = 2.5m(灰色和橙色外壳)
+    #LOC_Restock_variant-engine_size2_white = 2.5m (白色外壳)
+    #LOC_Restock_variant-engine_size2_grey-orange = 2.5m (灰色和橙色外壳)
     #LOC_Restock_variant-engine_size3 = 3.75m
     #LOC_Restock_variant-engine_compact = 紧凑
-    #LOC_Restock_variant-engine_compact_white = 紧凑(白色外壳)
-    #LOC_Restock_variant-engine_compact_grey-orange = 紧凑(灰色和橙色外壳)
-    #LOC_Restock_variant-engine_radial = 径向
+    #LOC_Restock_variant-engine_compact_white = 紧凑 (白色外壳)
+    #LOC_Restock_variant-engine_compact_grey-orange = 紧凑 (灰色和橙色外壳)
+    #LOC_Restock_variant-engine_radial = 径向安装
     #LOC_Restock_variant-engine_boattail = 艇尾型
-    #LOC_Restock_variant-engine_boattail_white = 艇尾型(白色)
-    #LOC_Restock_variant-engine_boattail_grey-orange = 艇尾型(灰色和橙色)
-    #LOC_Restock_variant-engine_boattail_size1 = 艇尾型(1.25m)
-    #LOC_Restock_variant-engine_boattail_size1p5 = 艇尾型(1.875m)
-    #LOC_Restock_variant-engine_boattail_size1_white = 艇尾型(1.25m，白色)
-    #LOC_Restock_variant-engine_boattail_size1p5_white = 艇尾型(1.875m，白色)
-    #LOC_Restock_variant-engine_boattail_size1_grey-orange = 艇尾型(1.25m，灰色和橙色)
-    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = 艇尾型(1.875m，灰色和橙色)
-    #LOC_Restock_variant-engine_tankbutt_size2_white = 箱尾型(2.5m，白色)
-    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = 箱尾型(2.5m，灰色和橙色)
+    #LOC_Restock_variant-engine_boattail_white = 艇尾型 (白色)
+    #LOC_Restock_variant-engine_boattail_grey-orange = 艇尾型 (灰色和橙色)
+    #LOC_Restock_variant-engine_boattail_orange = 艇尾型 (橙色)
+    #LOC_Restock_variant-engine_boattail_metal = 艇尾型 (金属)
+    #LOC_Restock_variant-engine_boattail_dark = 艇尾型 (深色)
+    #LOC_Restock_variant-engine_boattail_size1 = 艇尾型 (1.25m)
+    #LOC_Restock_variant-engine_boattail_size1p5 = 艇尾型 (1.875m)
+    #LOC_Restock_variant-engine_boattail_size1_white = 艇尾型 (1.25m, 白色)
+    #LOC_Restock_variant-engine_boattail_size1p5_white = 艇尾型 (1.875m, 白色)
+    #LOC_Restock_variant-engine_boattail_size1_grey-orange = 艇尾型 (1.25m, 灰色和橙色)
+    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = 艇尾型 (1.875m, 灰色和橙色)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = 燃料箱底部 (2.5m, 白色)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = 燃料箱底部 (2.5m, 灰色和橙色)
+    #LOC_Restock_variant-engine_singlebell_compact = 单喷管-紧凑
+    #LOC_Restock_variant-engine_singlebell_compact_white = 单喷管-紧凑 (白色外壳)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = 单喷管-紧凑 (灰色和橙色外壳)
+    #LOC_Restock_variant-engine_singlebell = 单喷管    
+    #LOC_Restock_variant-engine_singlebell_white = 单喷管 (白色外壳)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = 单喷管 (灰色和橙色外壳)
+    #LOC_Restock_variant-engine_quadbell = 四喷管 
+    #LOC_Restock_variant-engine_quadbell_white = 四喷管 (白色外壳)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = 四喷管 (灰色和橙色外壳)
+    #LOC_Restock_variant-engine_quadbell_compact = 四喷管-紧凑
+    #LOC_Restock_variant-engine_quadbell_compact_white = 四喷管-紧凑 (白色外壳)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = 四喷管-紧凑 (灰色和橙色外壳)
+
+    #LOC_Restock_variant-engine_boattail_size2_white = 艇尾型 (2.5m, 白色)
+    #LOC_Restock_variant-engine_boattail_size2_grey-orange = 艇尾型 (2.5m, 灰色和橙色)
+    #LOC_Restock_variant-engine_boattail_size3_white = 艇尾型 (3.75m, 白色)
+    #LOC_Restock_variant-engine_boattail_size3_grey-orange = 艇尾型 (3.75m, 灰色和橙色)
 
     #LOC_Restock_variant-engine_shroud_white = 白色外壳
     #LOC_Restock_variant-engine_shroud_grey-orange = 金属外壳
 
     #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-mounting_classic = 经典
-    #LOC_Restock_variant-mounting_classic_white = 经典(白色外壳)
-    #LOC_Restock_variant-mounting_classic_grey-orange = 经典(灰色和橙色外壳)
+    #LOC_Restock_variant-mounting_classic_white = 经典 (白色外壳)
+    #LOC_Restock_variant-mounting_classic_grey-orange = 经典 (灰色和橙色外壳)
     #LOC_Restock_variant-mounting_truss = 桁架
     #LOC_Restock_variant-mounting_compact = 紧凑
+    #LOC_Restock_variant-mounting_mounted = 带过渡段
 
-    #LOC_Restock_variant-gold-truss = 金色(支架)
-    #LOC_Restock_variant-silver-truss = 银色(支架)
+    #LOC_Restock_variant-gold-truss = 金色 (带支架)
+    #LOC_Restock_variant-silver-truss = 银色 (带支架)
 
-    #LOC_Restock_variant-engine_pod-orange = 外壳(橙色)
-    #LOC_Restock_variant-engine_pod-grey = 外壳(灰色)
+    #LOC_Restock_variant-engine_pod-orange = 荚舱 (橙色)
+    #LOC_Restock_variant-engine_pod-grey = 荚舱 (灰色)
 
     #LOC_Restock_variant-antenna_size0 = 0.625m
     #LOC_Restock_variant-antenna_size1 = 1.25m
     #LOC_Restock_variant-antenna_truss = 桁架
     #LOC_Restock_variant-antenna_compact = 紧凑
-    #LOC_Restock_variant-antenna_radial = 径向
-    #LOC_Restock_variant-antenna_radial_reverse = 径向(反向)
-    #LOC_Restock_variant-antenna_axial = 轴向
-    #LOC_Restock_variant-antenna_axial_reverse = 轴向(反向)
+    #LOC_Restock_variant-antenna_radial = 径向安装
+    #LOC_Restock_variant-antenna_radial_reverse = 径向安装 (反向)
+    #LOC_Restock_variant-antenna_axial = 轴向安装
+    #LOC_Restock_variant-antenna_axial_reverse = 轴向安装 (反向)
 
-    #LOC_Restock_variant-telescope_shielded = 防护罩
+    #LOC_Restock_variant-telescope_shielded = 带防护罩
     #LOC_Restock_variant-telescope_bare = 裸露
 
+    #LOC_Restock_variant-pod_bare = 裸露
+    #LOC_Restock_variant-pod_fabric_green = 绿色衬垫
+    #LOC_Restock_variant-pod_fabric_beige = 米色衬垫
+    #LOC_Restock_variant-pod_fabric_white = 白色衬垫
+
+    #LOC_Restock_variant-wheel_broken = 破损
+    #LOC_Restock_variant-wheel_bare = 裸露
+
     #LOC_Restock_variant-surface_metal = 金属
-    #LOC_Restock_variant-surface_basic = 基本
+    #LOC_Restock_variant-surface_basic = 基础
     #LOC_Restock_variant-surface_truss = 桁架
+    #LOC_Restock_variant-surface_warningStripes = 警告条纹
     #LOC_Restock_variant-surface_thermalblankets = 隔热
-
-    #LOC_Restock_variant-decoupler_metal = 金属
-    #LOC_Restock_variant-decoupler_grey-orange = 灰色和橙色
-
     #LOC_Restock_variant-surface_yellow = 黄色
     #LOC_Restock_variant-surface_black = 黑色
+    #LOC_Restock_variant-surface_white = 白色
+    #LOC_Restock_variant-surface_blue = 蓝色
+
+    #LOC_Restock_variant-strut_classic_metal = 金属
+    #LOC_Restock_variant-strut_classic_white = 白色
+    #LOC_Restock_variant-strut_compact_metal = 金属 (紧凑)
+    #LOC_Restock_variant-strut_compact_white = 白色 (紧凑)
+    
+    #LOC_Restock_variant-decoupler_metal = 金属
+    #LOC_Restock_variant-decoupler_grey-orange = 灰色和橙色
 
     #LOC_Restock_variant-service-bay-opaque = 实心舱盖
     #LOC_Restock_variant-service-bay-transparent = 桁架舱盖
     #LOC_Restock_variant-service-bay-hollow = 无舱盖
+    #LOC_Restock_variant-service-bay-open = 空荡
+    #LOC_Restock_variant-service-bay-tunnel = 对接口通道
+    #LOC_Restock_variant-service-bay-shelves = 层板
 
     #LOC_Restock_variant-heat-shield-black = 黑色
     #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-stayputnik-pod = 支架
+    #LOC_Restock_variant-stayputnik-pod = 带支架
     #LOC_Restock_variant-stayputnik-bare = 无支架
     #LOC_Restock_variant-probe-gold = 金色
     #LOC_Restock_variant-probe-silver = 银色
-    #LOC_Restock_variant-probe-bare = 基本
+    #LOC_Restock_variant-probe-bare = 基础
 
-    #LOC_Restock_variant-radiator_basic = 基本
-    #LOC_Restock_variant-radiator_flat = 平坦
+    #LOC_Restock_variant-radiator_basic = 基础
+    #LOC_Restock_variant-radiator_flat = 平面
     #LOC_Restock_variant-radiator_compact = 紧凑
 
-    #LOC_Restock_description-FuelCellArray = 你可以装三个燃料电池的话，干嘛只要一个？如果需要大量可靠电源，燃料电池阵列是理想的选择。和较小的燃料电池一样，该阵列可以将液体燃料和氧化剂转化为电量。
+    #LOC_Restock_variant-tube-length-short = 短
+    #LOC_Restock_variant-tube-length-med-short = 中短
+    #LOC_Restock_variant-tube-length-med = 中
+    #LOC_Restock_variant-tube-length-med-long = 中长
+    #LOC_Restock_variant-tube-length-long = 长
+
+    #LOC_Restock_variant-tube-length-short-alt = 短 (备选)
+    #LOC_Restock_variant-tube-length-med-short-alt = 中短 (备选)
+    #LOC_Restock_variant-tube-length-med-alt = 中 (备选)
+    #LOC_Restock_variant-tube-length-med-long-alt = 中长 (备选)
+    #LOC_Restock_variant-tube-length-long-alt = 长 (备选)
+
+    #LOC_Restock_description-FuelCellArray = 你可以装三个大号燃料电池的话，干嘛只要一个小号的？燃料电池组是追求海量可靠能源的用户的理想选择。这款产品也像更小的燃料电池一样，能将燃料和氧化剂转化成能量。
   }
 }

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

@@ -1,11 +1,94 @@
 // Patches applying art changes to relay antennas
 // Contents:
-// - HG-5 High Gain Antenna (HighGainAntenna5)
+// - Legacy HG-5 High Gain Antenna (HighGainAntenna5)
+// - HG-5 High Gain Antenna (HighGainAntenna5_v2)
 // - RA-2 Relay Antenna (RelayAntenna5)
 // - RA-15 Relay Antenna (RelayAntenna50)
 // - RA-100 Relay Antenna (RelayAntenna100)
 
 // HG-5 High Gain Antenna
+@PART[HighGainAntenna5_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Andrew Cassidy
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Communication/restock-relay-radial-1
+    rotation = 0, 90, 0
+  }
+  @MODULE[ModuleDeployableAntenna]
+  {
+    @animationName = Deploy
+    @pivotName = lower pivot
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Radial
+    VARIANT
+    {
+      name = Radial
+      displayName = #LOC_Restock_variant-antenna_radial
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        arm_radial = true
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+    VARIANT
+    {
+      name = Radial_Reverse
+      displayName = #LOC_Restock_variant-antenna_radial_reverse
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        arm_radial = false
+        arm_radial_reverse = true
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+    VARIANT
+    {
+      name = Axial
+      displayName = #LOC_Restock_variant-antenna_axial
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = true
+        arm_axial_reverse = false
+      }
+    }
+    VARIANT
+    {
+      name = Axial_Reverse
+      displayName = #LOC_Restock_variant-antenna_axial_reverse
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = true
+      }
+    }
+  }
+}
+
+// Legacy HG-5 High Gain Antenna
 @PART[HighGainAntenna5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy

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

@@ -1,7 +1,9 @@
 // Patches applying art changes to RCS blocks
 // Contents:
 // - RV-105 RCS Thruster Block (RCSBlock_v2)
+// - RV-1X RCS Thruster Block (RCSblock_01_small)
 // - Place-Anywhere 7 Linear RCS Port (linearRcs)
+// - Place-Anywhere 1 Linear RCS Port (RCSLinearSmall)
 // - Vernor Engine (vernorEngine)
 
 // RV-105 RCS Thruster Block
@@ -12,7 +14,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Control/restock-rcs-block-2
+    model = ReStock/Assets/Control/restock-rcs-block-multi-1
   }
   !EFFECTS {}
   EFFECTS
@@ -59,10 +61,301 @@
     }
   }
   !MODULE[FXModuleAnimateRCS] {}
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Angled
+    VARIANT
+    {
+      name = Angled
+      displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = true
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 5Horn
+      displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0.01
+      cost = 7
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = true
+      }
+    }
+    VARIANT
+    {
+      name = 4Horn
+      displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = true
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 3Horn
+      displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.01
+      cost = -8
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = true
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 2Horn
+      displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.02
+      cost = -15
+      GAMEOBJECTS
+      {
+        B_RCS2x = true
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    
+  }
   MODULE
   {
     name = ModuleRestockDepthMask
-    maskTransform = 4Mask
+    maskTransform = RCSMask
+  }
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
+  }
+}
+
+// RV-1X RCS Thruster Block
+@PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Control/restock-rcs-block-multi-mini-1
+  }
+  @rescaleFactor = 1
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO_MULTI_POOL
+      {
+        channel = Ship
+        transformName = RCSjet
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.1 0.0
+        volume = 0.5 0.025
+        volume = 1.0 0.1
+        pitch = 1.0
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx1
+        modelName = ReStock/FX/restock-fx-rcs-mini-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx2
+        modelName = ReStock/FX/restock-fx-rcs-mini-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+        localPosition = 0, 0.01, 0
+      }
+    }
+  }
+  !MODULE[FXModuleAnimateRCS] {}
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Angled
+    VARIANT
+    {
+      name = Angled
+      displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = true
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 5Horn
+      displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0.00125
+      cost = 5
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = true
+      }
+    }
+    VARIANT
+    {
+      name = 4Horn
+      displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = true
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 3Horn
+      displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.00125
+      cost = -5
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = true
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 2Horn
+      displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.0025
+      cost = -10
+      GAMEOBJECTS
+      {
+        B_RCS2x = true
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = RCSMask
+  }
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
   }
 }
 
@@ -74,7 +367,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Control/restock-rcs-linear-1
+    model = ReStock/Assets/Control/restock-rcs-linear-2
   }
   !EFFECTS {}
   EFFECTS
@@ -158,6 +451,148 @@
     name = ModuleRestockDepthMask
     maskTransform = 1MaskShroud
   }
+  !MODULE[FXModuleAnimateRCS] {}
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
+  }
+}
+
+// Place-Anywhere 1 Linear RCS Port
+@PART[RCSLinearSmall]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Control/restock-rcs-linear-mini-1
+  }
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.02 0.2
+        volume = 0.5 0.2
+        volume = 1.0 0.2
+        pitch = 1.0
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx1
+        modelName = ReStock/FX/restock-fx-rcs-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx2
+        modelName = ReStock/FX/restock-fx-rcs-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+        localPosition = 0, -0.015, 0
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = RCSMask
+  }
+  !MODULE[FXModuleAnimateRCS] {}
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      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
+  }
 }
 
 // Vernor Engine

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

@@ -173,13 +173,18 @@
   MODULE
   {
     name = ModuleLight
-    lightName = Lamp
-    useAnimationDim = true
+    lightName = SpotLight
+    lightMeshRendererName = LampLens
     lightBrightenSpeed = 2.5
     lightDimSpeed = 2.5
-    resourceAmount = 0.02
+    resourceAmount = 0.1 // 100W
     useResources = true
-    animationName = RestockClawLamp_On
+  }
+
+  MODULE
+  {
+    name = ModuleRestockEnhancedLight
+    cookiePath = ReStock/Assets/Electrical/restock-light-cookie-spot-1
   }
 }
 
@@ -333,15 +338,20 @@
     maskTransform = DepthMask
   }
 
-  MODULE  
+  MODULE
   {
     name = ModuleLight
     lightName = SpotLight
-    useAnimationDim = true  
-    lightBrightenSpeed = 2.5  
+    lightMeshRendererName = LampLens
+    lightBrightenSpeed = 2.5
     lightDimSpeed = 2.5
-    resourceAmount = 0.02
+    resourceAmount = 0.08 // 80W
     useResources = true
-    animationName = RestockMiniClawLamp_On
+  }
+
+  MODULE
+  {
+    name = ModuleRestockEnhancedLight
+    cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-2
   }
 }

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

@@ -2,6 +2,12 @@
 // Contents:
 // - Illuminator Mk1 (spotLight1)
 // - Illuminator Mk2 (spotLight2)
+// - MDomelight Mk1(Nertea) (domeLight1)
+// - Spotlight Mk1 (Nertea) (spotLight3)
+// - LightStrip Mk1 (stripLight1)
+// - Navigation Light Mk1 (navLight1)
+// - Work Lamp - Small (groundLight1)
+// - Work Lamp - Stand (groundLight2)
 
 // Illuminator Mk1
 @PART[spotLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -11,16 +17,55 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-light-spot-1
+    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]
   {
-    @animationName = RestockSpotLight_On
+    @lightMeshRendererName = SpotLightLens
     @lightName = Spot
+    movementTransformName = SpotLightBase
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
   }
+  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
@@ -31,14 +76,509 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-light-flood-1
+    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]
   {
-    @animationName = RestockFloodLight_On
+    @lightMeshRendererName = FloodLightLens
     @lightName = Spot
+    movementTransformName = FloodR
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMin = 0
+    pitchMax = 180
   }
+  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 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
+    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]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-dome-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = DomeLightLens
+  }
+
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }     
+  } 
+}
+
+// [1.11] Spot Light
+@PART[spotLight3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-spot-3
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = SpotLens
+    @movementTransformName = SpotlightRotator
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }  
+  } 
+}
+
+// [1.11] Strip Light
+@PART[stripLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-strip-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = RectangleLightLens
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    }  
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    } 
+  } 
+}
+
+// [1.11] Nav Light
+@PART[navLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-nav-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = NavLightLens
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    }   
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }
+  } 
+}
+
+// [1.11] Ground Light Small
+@PART[groundLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-deploy-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = DeployLightLens
+    movementTransformName = DeployLightRotate
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = -10
+    pitchAngle = 0
+    pitchMax = 135
+  }
+  //MODULE
+  //{
+  //  name = ModuleRestockEnhancedLight
+  //  cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-1
+  //}
+}
+// [1.11] Big deployable light
+@PART[groundLight2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-deploy-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = LargeDeployLightLens
+    @movementTransformName = LargeDeployArm
+  }
+  //MODULE
+  //{
+  // name = ModuleRestockEnhancedLight
+  //  cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-1
+  //}
+}

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

@@ -24,6 +24,8 @@
   @MODULE[ModuleDeployableSolarPanel]
   {
     @secondaryTransformName = panel6
+    @animationName = 1x6SolarPanels
+    @breakName = sunParent
   }
 }
 
@@ -43,6 +45,8 @@
   @MODULE[ModuleDeployableSolarPanel]
   {
     @secondaryTransformName = panel6
+    @animationName = 1x6ShroudSolarPanels
+    @breakName = sunParent
   }
   MODULE
   {
@@ -67,6 +71,8 @@
   @MODULE[ModuleDeployableSolarPanel]
   {
     @secondaryTransformName = solar6
+    @animationName = 3x2SolarPanels
+    @breakName = sunParent
   }
 }
 
@@ -86,6 +92,9 @@
   @MODULE[ModuleDeployableSolarPanel]
   {
     @secondaryTransformName = solar6
+    @animationName = 3x2ShroudSolarPanels
+    @breakName = sunParent
+
   }
   MODULE
   {
@@ -107,6 +116,16 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+    transformName = PanelTruss
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @breakName = pivotBase
+  }
 }
 
 // OX-STAT Photovoltaic Panels

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

@@ -570,15 +570,15 @@
         ShroudOrangeCompact = true
         B_Poodle_Single = false
         Shroud1 = false
-        Shroud2 = true
+        Shroud2 = false
         Shroud3 = true
         B_Poodle_SingleCommon =  true
         B_Poodle_SingleCompact =  true
       }
       NODES
       {
-        node_attach = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
-        node_stack_top = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_attach = 0.0, -0.678, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, -0.678, 0.0, 0.0, 1.0, 0.0, 2
         node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
@@ -1866,3 +1866,249 @@
     useMultipleDragCubes = false
   }
 }
+
+// LFB KR-1x2 "Twin-Boar" Liquid Fuel Engine
+@PART[Size2LFB_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-twinboar-2
+  }
+  MODEL
+  {
+    model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange
+    position = 0.0, 4.356, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  !EFFECTS {}
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_soft
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_exhaustSparks_flameout_2
+        transformName = smokePoint
+        oneShot = true
+      }
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-twinboar-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_spurts
+        volume = 0.0 0.0
+        volume = 0.01 0.4
+        volume = 1.0 1.0
+        pitch = 0.0 0.2
+        pitch = 0.01 0.6
+        pitch = 1.0 1.8
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-boar-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-boar-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = turbo
+        modelName = ReStock/FX/restock-fx-boar-turbo-1
+        transformName = fxTransformTurbo
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_veryLarge
+        transformName = smokePoint
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+        localOffset = 0, 0, 1
+      }
+    }
+  }
+  @MODULE[ModuleGimbal]
+  {
+    @gimbalTransformName = B_Gimbal
+    gimbalResponseSpeed = 8
+    useGimbalResponseSpeed = true
+  }
+  @MODULE[ModuleEnginesFX]
+  {
+    @runningEffectName = fx-twinboar-running
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    // Basic
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTop005
+      rotatorsName = CylBot005
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTop006
+      rotatorsName = CylBot006
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTop007
+      rotatorsName = CylBot007
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTop008
+      rotatorsName = CylBot008
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBot005
+      rotatorsName =CylTop005
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBot006
+      rotatorsName = CylTop006
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBot007
+      rotatorsName = CylTop007
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBot008
+      rotatorsName = CylTop008
+    }
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCore
+    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
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+}