Merge pull request #759 from PorktoberRevolution/master

Release 1.0.1
5 years ago · 745bcaa376
parent f8667a8e7a 3449790cb5
commit 745bcaa376
16 changed files with 116 additions and 26 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
--- a/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg
+++ b/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg
@ -0,0 +1,67 @@
+// FAR ships a RealChute Lite that is similar to the RC patch
+
+@PART[parachuteDrogue]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
+{
+  @MODULE[RealChuteFAR]
+  {
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = ChuteCap
+    @canopyName  = B_ParachuteLargeDrogueRotator
+  }
+
+  !DRAG_CUBE {}
+}
+
+@PART[parachuteLarge]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
+{
+  @MODULE[RealChuteFAR]
+  {
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = ChuteCap
+    @canopyName  = B_ParachuteLargeRotator
+  }
+
+  !DRAG_CUBE {}
+}
+
+@PART[parachuteSingle]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
+{
+  @MODULE[RealChuteFAR]
+  {
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = SmallChuteCap
+    @canopyName  = B_ParachuteRoot004
+  }
+
+  !DRAG_CUBE {}
+}
+
+@PART[parachuteRadial]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
+{
+  @MODULE[RealChuteFAR]
+  {
+    
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = RadialChuteCap
+    @canopyName  = B_ParachuteRoot
+  }
+
+  !DRAG_CUBE {}
+}
+
+@PART[radialDrogue]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
+{
+  @MODULE[RealChuteFAR]
+  {
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = RadialChuteCapDrogue
+    @canopyName  = B_ParachuteRoot005
+  }
+
+  !DRAG_CUBE {}
+}
--- a/Distribution/Restock/GameData/ReStock/Compatibility/RealChute.cfg
+++ b/Distribution/Restock/GameData/ReStock/Compatibility/RealChute.cfg
@ -1,6 +1,6 @@
 // RealChute compatability fixes

-@PART[parachuteDrogue]:AFTER[RealChute]
+@PART[parachuteDrogue]:NEEDS[RealChute]:AFTER[ReStock]
 {
  @MODULE[RealChuteModule]
  {
@ -16,7 +16,7 @@
  !DRAG_CUBE {}
 }

-@PART[parachuteLarge]:AFTER[RealChute]
+@PART[parachuteLarge]:NEEDS[RealChute]:AFTER[ReStock]
 {
  @MODULE[RealChuteModule]
  {
@ -32,7 +32,7 @@
  !DRAG_CUBE {}
 }

-@PART[parachuteSingle]:AFTER[RealChute]
+@PART[parachuteSingle]:NEEDS[RealChute]:AFTER[ReStock]
 {
  @MODULE[RealChuteModule]
  {
@ -48,7 +48,7 @@
  !DRAG_CUBE {}
 }

-@PART[parachuteRadial]:AFTER[RealChute]
+@PART[parachuteRadial]:NEEDS[RealChute]:AFTER[ReStock]
 {
  @MODULE[RealChuteModule]
  {
@ -64,7 +64,7 @@
  !DRAG_CUBE {}
 }

-@PART[radialDrogue]:AFTER[RealChute]
+@PART[radialDrogue]:NEEDS[RealChute]:AFTER[ReStock]
 {
  @MODULE[RealChuteModule]
  {
--- 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/Restock.restockblacklist
+++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist
@ -44,7 +44,6 @@ Squad/Parts/Electrical/radialFlatSolarPanel/
 Squad/Parts/Engine/ionEngine/
 Squad/Parts/Engine/liquidEngine24-77/
 Squad/Parts/Engine/liquidEngine24-77_v2/
-Squad/Parts/Engine/liquidEngine48-7S/
 Squad/Parts/Engine/liquidEngine48-7S_v2/
 Squad/Parts/Engine/liquidEngineLV-1/
 Squad/Parts/Engine/liquidEngineLV-1_v2/
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@ -1,4 +1,16 @@
-v0.2.0
+v1.0.1
+-----
+- Fixed lack of bundled ModuleManager
+- Updated Simplified Chinese localization (Duck1998)
+- Fixed an issue with the localization of the radial reaction wheel assembly (#742)
+- Fixed compatability with FAR in a case where RealChute is NOT installed (#751)
+- Fixed compatability with RealChute and NO FAR (#756)
+- Fixed Skippper orange boattail texture assignments (#754)
+- Fixed large truss piece collider scaling (#753)
+- Un-blacklisted legacy Squad spark model (we don't have an appropriate replacement anymore)
+- Updated Chinese translation (Duck1998)
+
+v1.0.0
 ------
 - KSP 1.8 compatibility
 - Phase 2 release
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-n.dds
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-25-3-shrouds-n.dds
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/es-es.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/es-es.cfg
@ -50,9 +50,9 @@ Localization
    #LOC_RestockPlus_restock-engine-srb-anvil_tags = a moar (more motor rocket shuttle ssrb srb restock anvil solido motores motor

    // CONTROL
-    #LOC_RestockPlus_reactionwheel-radial-1_title = Giroscopio Radial Pequeño
-    #LOC_RestockPlus_reactionwheel-radial-1_description = El pequeño giroscopio de Steadler proporciona una pequeña cantidad de capacidad de rotación pero con mayor eficiencia energética, permitiendo que estaciones espaciales mantengan su orientación con aún menos potencia. Aun no estamos seguros del todo como funcionan los giroscopios, pero permiten rotación en los tres ejes... increiblemente.
-    #LOC_RestockPlus_reactionwheel-radial-1_tags = cmg command control fly gyro moment react stab steer torque magic_spinny_thing comando momento par girar rotar
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_title = Giroscopio Radial Pequeño
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_description = El pequeño giroscopio de Steadler proporciona una pequeña cantidad de capacidad de rotación pero con mayor eficiencia energética, permitiendo que estaciones espaciales mantengan su orientación con aún menos potencia. Aun no estamos seguros del todo como funcionan los giroscopios, pero permiten rotación en los tres ejes... increiblemente.
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_tags = cmg command control fly gyro moment react stab steer torque magic_spinny_thing comando momento par girar rotar

    // RCS
    #LOC_RestockPlus_restock-rcs-block-dual-1_title = Bloque RCS RV-102
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/pt-br.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/pt-br.cfg
@ -49,9 +49,9 @@ Localization
    #LOC_RestockPlus_restock-engine-srb-anvil_tags = (mais motor foguete shuttle ônibus ssrb BCS restock anvil

    // CONTROL
-    #LOC_RestockPlus_reactionwheel-radial-1_title = Pequeno Giroscópio Radial
-    #LOC_RestockPlus_reactionwheel-radial-1_description = O pequeno giroscópio radial STEADLER provê uma pequena quantidade de torque com maior eficiência energética, permitindo que até mesmo grandes estações espaciais controlem sua atitude com um mínimo de esforço. Não ainda não sabemos muito bem como giroscópios funcionam, mas este aqui fornece torque nos três eixos.
-    #LOC_RestockPlus_reactionwheel-radial-1_tags = cmg comando controle voar giroscópio momento reagir estabiliza vira torque spinner
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_title = Pequeno Giroscópio Radial
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_description = O pequeno giroscópio radial STEADLER provê uma pequena quantidade de torque com maior eficiência energética, permitindo que até mesmo grandes estações espaciais controlem sua atitude com um mínimo de esforço. Não ainda não sabemos muito bem como giroscópios funcionam, mas este aqui fornece torque nos três eixos.
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_tags = cmg comando controle voar giroscópio momento reagir estabiliza vira torque spinner

    // RCS
    #LOC_RestockPlus_restock-rcs-block-dual-1_title = Bloco de Propulsores SCR RV-102
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/zh-cn.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/zh-cn.cfg
@ -87,9 +87,9 @@ Localization
    // =======

    // Reaction wheels
-    #LOC_RestockPlus_reactionwheel-radial-1_title = 小型径向陀螺仪
-    #LOC_RestockPlus_reactionwheel-radial-1_description = STEADLER的小型径向陀螺仪只能提供少量扭矩，但有着更高的能效，即使是大型空间站也能以最小的功率保持姿态。我们仍然不完全清楚陀螺仪是如何工作的，但至少这个陀螺仪在所有三个轴上都能提供扭矩。
-    #LOC_RestockPlus_reactionwheel-radial-1_tags = 方位 指令 控制 飞行 陀螺 动量 反应 稳定 转向 扭矩 magic_spinny_thing restock
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_title = 小型径向陀螺仪
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_description = STEADLER的小型径向陀螺仪只能提供少量扭矩，但有着更高的能效，即使是大型空间站也能以最小的功率保持姿态。我们仍然不完全清楚陀螺仪是如何工作的，但至少这个陀螺仪在所有三个轴上都能提供扭矩。
+    #LOC_RestockPlus_restock-reactionwheel-radial-1_tags = 方位 指令 控制 飞行 陀螺 动量 反应 稳定 转向 扭矩 magic_spinny_thing restock

    #LOC_RestockPlus_restock-reactionwheel-1875-1_title = 中型动量轮模块
    #LOC_RestockPlus_restock-reactionwheel-1875-1_description = 我们购买了多个动量轮模块，以确保在飞行的所有阶段都能准确控制我们的中型火箭。
@ -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/Control/restock-reactionwheel-radial-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/restock-reactionwheel-radial-1.cfg
@ -25,9 +25,9 @@ PART
  category = Control
  subcategory = 0

-  title = #LOC_RestockPlus_reactionwheel-radial-1_title //Small Radial Gyroscope
+  title = #LOC_RestockPlus_restock-reactionwheel-radial-1_title //Small Radial Gyroscope
  manufacturer = #autoLOC_501631 //#autoLOC_501631 = STEADLER Engineering Corps
-  description = #LOC_RestockPlus_reactionwheel-radial-1_description
+  description = #LOC_RestockPlus_restock-reactionwheel-radial-1_description
  // Steadler's small radial gyroscope provides a small amount of torque but with greater power efficiency, allowing even large stations to maintain attitude with minimal power. We're still not entirely sure how gyroscopes work, but this one allows torque on all three axes.  mass = 0.08

  dragModelType = default
@ -37,7 +37,7 @@ PART
  crashTolerance = 8
  maxTemp = 2000
  bulkheadProfiles = srf
-  tags = #LOC_RestockPlus_reactionwheel-radial-1_tags //cmg command control fly gyro moment react stab steer torque magic_spinny_thing
+  tags = #LOC_RestockPlus_restock-reactionwheel-1875-1_tags //cmg command control fly gyro moment react stab steer torque magic_spinny_thing

  MODULE
  {
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@ -1,3 +1,11 @@
+v1.0.1
+------
+- Fixed lack of bundled ModuleManager
+- Updated Simplified Chinese localization (Duck1998)
+- Fixed Cherenkov shroud texture assignments (#754)
+- Fixed x-large truss piece collider scaling (#753)
+- Updated Chinese translation (Duck1998)
+
 v1.0.0
 ------
 - KSP 1.8 compatability