Merge pull request #119 from ChrisAdderley/dev

Release 1.1.1
post-kerbin-mining-corporation · Feb 20, 2020 · 708ab6e · 708ab6e
2 parents 173442f + f76fb72
commit 708ab6e
Show file tree

Hide file tree

Showing 8 changed files with 163 additions and 140 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,16 +8,16 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.0
+    version: 4.1.3
     location: s3
   B9PartSwitch:
-    version: 2.12.1
+    version: 2.13.0
     location: s3
   CommunityResourcePack:
     version: 1.0.0
     location: s3
   DynamicBatteryStorage:
-    tag: 2.1.0
+    tag: 2.1.5
     location: github
     repository: ChrisAdderley/DynamicBatteryStorage
 deploy:

diff --git a/GameData/NearFutureElectrical/Localization/Localization.md b/GameData/NearFutureElectrical/Localization/Localization.md
@@ -28,7 +28,7 @@ There are some characters that should not be translated into another language an
 
 * fitiales (Spanish)
 * GabrielGABFonesca (Portugese)
-* Dr. Jet (Russian)
-* DYZBX from the Black Domain Studio (Chinese)
+* Dr. Jet, Sooll3 (Russian)
+* DYZBX from the Black Domain Studio, tinygrox (Chinese)
 * GabrielGABFonesca (Portugese)
 * Three_Pounds (German)
diff --git a/GameData/NearFutureElectrical/Localization/ru.cfg b/GameData/NearFutureElectrical/Localization/ru.cfg
diff --git a/GameData/NearFutureElectrical/Localization/zh-cn.cfg b/GameData/NearFutureElectrical/Localization/zh-cn.cfg
@@ -13,15 +13,19 @@ Localization
     #LOC_NFElectrical_manufacturer_capitalcity_title =首都电子
 
     // VARIANTS
-    #LOC_NFElectrical_reactor_switcher_mount_title =底座
-    #LOC_NFElectrical_reactor_switcher_mount_variant1 =内联的
-    #LOC_NFElectrical_reactor_switcher_mount_variant2 =开启
+    #LOC_NFElectrical_reactor_switcher_mount_title = 底座
+    #LOC_NFElectrical_reactor_switcher_mount_variant1 = 直列式
+    #LOC_NFElectrical_reactor_switcher_mount_variant2 = 开放式
+    #LOC_NFElectrical_reactor_switcher_open_summary = 开放式
+    #LOC_NFElectrical_reactor_switcher_open_detail = 反应堆没有顶部节点
+    #LOC_NFElectrical_reactor_switcher_inline_summary = 直列桁架
+    #LOC_NFElectrical_reactor_switcher_inline_detail = 为了增加通用性, 反应堆可直列安装
 
     // PARTS
     // Batteries
     #LOC_NFElectrical_battery-0625_title = B-3K可充电电池组
     #LOC_NFElectrical_battery-0625_description = B-3K电池最大的卖点在于它依赖于28个4A电池,以备冗余.
-    #LOC_NFElectrical_battery-0625_tags =近期电池充电e/c选择包装的电源电压瓦数
+    #LOC_NFElectrical_battery-0625_tags =近期 电池 充电 e/c 选择 包装的 电源 电压 瓦数
     #LOC_NFElectrical_battery-125_title =B-6K可充电电池组
     #LOC_NFElectrical_battery-125_description =B-6K通常比B-3K更可靠,因为它使用的是不容易发生事故的E级电芯.棉絮电池供应商还宣传每一种电芯的更换功能,但同时也建议不要由小绿人来更换.当然也不是在太空.
     #LOC_NFElectrical_battery-125_tags =近期电池充电e/c选择包装的电源电压瓦数
@@ -117,6 +121,12 @@ Localization
 
 
     // PLUGIN
+
+    #LOC_NFElectrical_Units_kW = kW
+    #LOC_NFElectrical_Units_EcS = EC/s
+    #LOC_NFElectrical_Units_ScS = SC/s
+    #LOC_NFElectrical_Units_K = K
+
     // ModuleDischargeCapacitor
 	#LOC_NFElectrical_ModuleDischargeCapacitor_ModuleName =电容器
 	#LOC_NFElectrical_ModuleDischargeCapacitor_PartInfo =最大放电率: <<1>>/s \n充电率: <<2>> Sc/s \n效率: <<3>>%
@@ -177,6 +187,7 @@ Localization
 	#LOC_NFElectrical_ModuleFissionGenerator_ModuleName =反应堆发电机
 	#LOC_NFElectrical_ModuleFissionGenerator_PartInfo =发电量: <<1>> Ec/s
 	#LOC_NFElectrical_ModuleFissionGenerator_Field_GeneratorStatus =产生
+  #LOC_NFElectrical_ModuleFissionGenerator_Field_GeneratorStatus_Normal = <<1>> Ec/s
 	#LOC_NFElectrical_ModuleFissionGenerator_Field_GeneratorStatus_Offline =离线
 
 	// FissionFlowRadiator

diff --git a/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version b/GameData/NearFutureElectrical/Versioning/NearFutureElectrical.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":1,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":8,
-        "PATCH":1
+        "MINOR":9,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":8,
+        "MINOR":9,
         "PATCH":99
     }
 }
diff --git a/README.md b/README.md
@@ -22,10 +22,10 @@ Ever wanted some futuristic energy generation that wasn't too... futuristic? I h
 
 ### Required
 These components are required for the mod to function and are bundled as part of any download:
-* [ModuleManager (4.1.0)](https://github.com/sarbian/ModuleManager)
-* [B9PartSwitch (2.12.1)](https://github.com/blowfishpro/B9PartSwitch)
+* [ModuleManager (4.1.3)](https://github.com/sarbian/ModuleManager)
+* [B9PartSwitch (2.13.0)](https://github.com/blowfishpro/B9PartSwitch)
 * [Community Resource Pack (1.3.0)](https://github.com/BobPalmer/CommunityResourcePack)
-* [DynamicBatteryStorage (2.0.6)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
+* [DynamicBatteryStorage (2.1.5)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
 
 ## Installation
 
@@ -55,8 +55,8 @@ I certainly accept pull requests. Please target all such things to the `dev` bra
 For translation instructions please see [Localization Instructions](https://github.com/ChrisAdderley/NearFutureElectrical/blob/master/GameData/NearFutureElectrical/Localization/Localization.md)
 
 * **Spanish:** KSP forum user fitiales
-* **Chinese:** KSP forum user DYZBX from the Black Domain Studio(BDS)
-* **Russian:** KSP forum user Dr. Jet
+* **Chinese:** KSP forum users DYZBX from the Black Domain Studio(BDS) and tinygrox
+* **Russian:** KSP forum users Dr. Jet and Sool3
 * **Portugese:** KSP forum user GabrielGABFonesca
 * **German:** KSP forum user Three_Pounds
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+v1.1.1
+------
+- Marked for KSP 1.9
+- Updated B9PartSwitch to 2.13.0
+- Updated DynamicBatteryStorage to 2.1.5
+- Updated ModuleManager to 4.1.3
+- Updated Russian localization (Sool3)
+- Updated Simplified Chinese localization (tinygrox)
+
 v1.1.0
 ------
 - KSP 1.8

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ==================================
-NEAR FUTURE ELECTRICAL PACK v1.1.0
+NEAR FUTURE ELECTRICAL PACK v1.1.1
 ==================================
 
 This pack contains advanced electrical parts - capacitors, nuclear reactors and new battery packs.
@@ -9,10 +9,10 @@ DEPENDENCIES
 ============
 
 Required:
-- B9PartSwitch (2.12.1)
+- B9PartSwitch (2.13.0)
 - Community Resource Pack (1.3.0)
-- ModuleManager (4.1.0)
-- DynamicBatteryStorage (2.1.0)
+- ModuleManager (4.1.3)
+- DynamicBatteryStorage (2.1.5)
 
 Optional
 - Community Tech Tree (v2.2+)
@@ -39,8 +39,8 @@ LOCALIZATION
 
 This mod includes localization support, and includes translations for
 - Spanish (KSP forum user fitiales)
-- Chinese (KSP forum user DYZBX from the Black Domain Studio(BDS))
-- Russian (KSP forum user Dr. Jet)
+- Chinese (KSP forum users DYZBX from the Black Domain Studio(BDS) and tinygroz)
+- Russian (KSP forum users Dr. Jet and Sool3)
 - Portugese (KSP forum user GabrielGABFonesca)
 - German (KSP forum user Three_Pounds)