Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked

5 years ago · c8298d74af
parent c9cfccc182 5f9fbc835c
commit c8298d74af
16 changed files with 70 additions and 27 deletions
--- a/CKAN/ReStockRigidLegs.netkan
+++ b/CKAN/ReStockRigidLegs.netkan
@ -0,0 +1,28 @@
+{
+  "spec_version": "v1.4",
+  "identifier": "RestockRigidLegs",
+  "name": "ReStock Extra - Rigid Legs",
+  "abstract": "A copy of the redone Restock legs with no suspension included",
+  "author": "ReStock Team",
+  "$kref": "#/ckan/github/PorktoberRevolution/ReStocked/asset_match/ReStock_.*?\\.zip",
+  "$vref": "#/ckan/ksp-avc",
+  "license": "restricted",
+  "resources": {
+    "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/182679-161-restock-revamping-ksps-art/",
+    "repository": "https://github.com/PorktoberRevolution/ReStocked"
+  },
+  "install": [
+    {
+      "find": "RestockRigidLegs",
+      "install_to": "GameData"
+    }
+  ],
+  "depends": [
+    {
+      "name": "ModuleManager"
+    },
+    {
+      "name": "ReStock"
+    }
+  ]
+}
--- a/Distribution/Restock/.mod_data.yml
+++ b/Distribution/Restock/.mod_data.yml
@ -8,6 +8,9 @@ package:
    - readme.txt
    - changelog.txt
    - license.txt
+  extras-path: Distribution/RestockExtras/
+  included-extras:
+    - RestockRigidLegs
 dependencies:  # Configure dependencies
  ModuleManager:
    version: 4.1.0
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-b.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-b.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-b.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-b.dds
--- a/Distribution/Restock/GameData/ReStock/Localization/zh-cn.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/zh-cn.cfg
@ -40,9 +40,11 @@ Localization
    #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_size1p5_white = 箱尾型(2.5m，白色)
+    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = 箱尾型(2.5m，灰色和橙色)

-    #LOC_Restock_variant-engine_shroud_white = 金属外壳
-    #LOC_Restock_variant-engine_shroud_grey-orange = 白色外壳
+    #LOC_Restock_variant-engine_shroud_white = 白色外壳
+    #LOC_Restock_variant-engine_shroud_grey-orange = 金属外壳

    #LOC_Restock_variant-engine_shroud = 外壳
    #LOC_Restock_variant-engine_shroud_wide = 宽外壳
@ -77,10 +79,12 @@ Localization
    #LOC_Restock_variant-surface_truss = 桁架
    #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-service-bay-opaque = 实心舱盖
    #LOC_Restock_variant-service-bay-transparent = 桁架舱盖
    #LOC_Restock_variant-service-bay-hollow = 无舱盖
--- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg
@ -32,7 +32,7 @@
 }

 // Hitchhiker
-@PART[crewCabin]:FOR[zzzzStationParts]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[crewCabin]:HAS[~RestockIgnore[*]]:FOR[ReStock]
 {
  @author = Chris Adderley
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
+++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
@ -13,7 +13,7 @@
    {
        "MAJOR":1,
        "MINOR":8,
-        "PATCH":0
+        "PATCH":1
    },
    "KSP_VERSION_MIN":{
        "MAJOR":1,
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@ -1,4 +1,8 @@
-v0.2.0
+v1.0.1
+-----
+- Updated Simplified Chinese localization (Duck1998)
+
+v1.0.0
 ------
 - KSP 1.8 compatibility
 - Phase 2 release
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-b.dds
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-b.dds
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
@ -164,7 +164,7 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-sphere-0625-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank round spher hemi

    // 1.25m
-    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_title = FL-T100-R Hemispherical Liquid Fuel Tank
+    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_title = FL-T50-R Hemispherical Liquid Fuel Tank
    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_description = A 1.25m half-sphere that stores liquid fuel and oxidizer.
    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank round spher hemi

@ -207,7 +207,7 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-sphere-1875-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank round spher hemi

    // 2.5m
-    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_title = Rockomax X-200-R Hemispherical Liquid Fuel Tank
+    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_title = Rockomax X-200-4R Hemispherical Liquid Fuel Tank
    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_description = This fuel tank is half a sphere. It should not be used as a pool, unlike other Rockomax products
    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank round spher hemi

@ -220,8 +220,8 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-375-4_description = A special compact tank filling a particular hole in Kerbodyne's heavy part lineup. Now you can make Kerosene pancakes!
    #LOC_RestockPlus_restock-fuel-tank-375-4_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank s3 1800

-    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_title = Kerbodyne S3-1800R Hemispherical Liquid Fuel Tank
-    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_description = Compared to the -1800, the -1800R is rounder, more spherical, and importantly, more cut in two. 
+    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_title = Kerbodyne S3-900R Hemispherical Liquid Fuel Tank
+    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_description = Compared to the S3-1800, the S3-900R is rounder, more spherical, and importantly, more cut in two. 
    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank round spher hemi

    // THERMAL
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/zh-cn.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/zh-cn.cfg
@ -164,7 +164,7 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-sphere-0625-1_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 圆 球 半

    // 1.25m
-    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_title = FL-T100-R半球形燃料箱
+    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_title = FL-T50-R半球形燃料箱
    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_description = 一个用于存储液体燃料与氧化剂的1.25m直径半球。
    #LOC_RestockPlus_restock-fuel-tank-sphere-125-1_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 圆 球 半

@ -207,7 +207,7 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-sphere-1875-1_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 圆 球 半

    // 2.5m
-    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_title = Rockomax X-200-R半球形燃料箱
+    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_title = Rockomax X-200-4R半球形燃料箱
    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_description = 这个油箱是半球形的。与其他极限火箭产品不同，它不应被用作游泳池。
    #LOC_RestockPlus_restock-fuel-tank-sphere-25-1_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 圆 球 半

@ -220,8 +220,8 @@ Localization
    #LOC_RestockPlus_restock-fuel-tank-375-4_description = 一个特殊的紧凑型燃料箱，填补了坎巴拉动力重型部件产品线中特定空缺。现在你可以制作煤油煎饼了！
    #LOC_RestockPlus_restock-fuel-tank-375-4_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 s3 1800

-    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_title = Kerbodyne S3-1800R半球形燃料箱
-    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_description = 与-1800相比，-1800R更圆润，更加像球形，而且更重要的是，它被切成了两半。
+    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_title = Kerbodyne S3-900R半球形燃料箱
+    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_description = 与S3-1800相比，S3-900R更圆润，更加像个球，更重要的是只有一半的容量。
    #LOC_RestockPlus_restock-fuel-tank-sphere-375-1_tags = restock 燃料 燃料箱 ?液体燃料 液体 氧化 推进 火箭 箱 圆 球 半

    // THERMAL
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg
@ -48,14 +48,14 @@ PART
  RESOURCE
  {
    name = LiquidFuel
-    amount = 45
-    maxAmount = 45
+    amount = 22.5
+    maxAmount = 22.5
  }
  RESOURCE
  {
    name = Oxidizer
-    amount = 55
-    maxAmount = 55
+    amount = 27.5
+    maxAmount = 27.5
  }
  MODULE
  {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg
@ -48,14 +48,14 @@ PART
  RESOURCE
  {
    name = LiquidFuel
-    amount = 360
-    maxAmount = 360
+    amount = 180
+    maxAmount = 180
  }
  RESOURCE
  {
    name = Oxidizer
-    amount = 440
-    maxAmount = 440
+    amount = 220
+    maxAmount = 220
  }
  MODULE
  {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg
@ -48,14 +48,14 @@ PART
  RESOURCE
  {
    name = LiquidFuel
-    amount = 810
-    maxAmount = 810
+    amount = 405
+    maxAmount = 405
  }
  RESOURCE
  {
    name = Oxidizer
-    amount = 990
-    maxAmount = 990
+    amount = 495
+    maxAmount = 495
  }
  MODULE
  {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
@ -13,7 +13,7 @@
    {
        "MAJOR":1,
        "MINOR":8,
-        "PATCH":0
+        "PATCH":1
    },
    "KSP_VERSION_MIN":{
        "MAJOR":1,
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@ -1,3 +1,7 @@
+v1.0.1
+------
+- Updated Simplified Chinese localization (Duck1998)
+
 v1.0.0
 ------
 - KSP 1.8 compatability