Merge pull request #327 from ihsoft/next

Release v1.20
ihsoft · May 4, 2019 · 9aa7906 · 9aa7906
2 parents 431c640 + 271c76c
commit 9aa7906
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.20 (May 3rd, 2019)):
+* [Fix #326] Text formating in PAW menu.
+
 # 1.19 (May 2nd, 2019):
 * [Change] `KSP 1.7.*` compatibility.
 * [Change] Update ES-ES localization.

diff --git a/KIS.version b/KIS.version
@@ -19,9 +19,9 @@
     "NAME": "Kerbal Inventory System", 
     "URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version", 
     "VERSION": {
-        "BUILD": 39277, 
+        "BUILD": 41416, 
         "MAJOR": 1, 
-        "MINOR": 19, 
-        "PATCH": 7061
+        "MINOR": 20, 
+        "PATCH": 7062
     }
 }
diff --git a/Lang/en-us.cfg b/Lang/en-us.cfg
@@ -460,7 +460,7 @@ Localization
 		#kisLOC_00029 = Seat <<1>> inventory
 		// The name of the part's menu item that opens the inventory of a specific kerbal.
 		// Argument <<1>> is the first name of the kerbal.
-		#kisLOC_00030 = <<1>>'s inventory
+		#kisLOC_00030 = <<gen:1>>'s inventory
 		// The name of the part's menu item that opens the associated inventory. The "part"
 		// can be a kerbal.
 		#kisLOC_00031 = Inventory

diff --git a/Source/ModuleKISInventory.cs b/Source/ModuleKISInventory.cs
@@ -214,7 +214,7 @@ public class ModuleKISInventory : PartModule,
 
   static readonly Message<string> PersonalInventoryMenuTxt = new Message<string>(
       "#kisLOC_00030",
-      defaultTemplate: "<<1>>`s inventory",
+      defaultTemplate: "<<gen:1>>\'s inventory",
       description: "The name of the part's menu item that opens the inventory of a specific kerbal."
       + "\nArgument <<1>> is the first name of the kerbal.");
 

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.19.*")]
-[assembly: AssemblyInformationalVersion ("1.19-pre for KSP 1.6+")]
-[assembly: KSPAssembly ("KIS", 1, 19)]
+[assembly: AssemblyVersion ("1.20.*")]
+[assembly: AssemblyInformationalVersion ("1.20 for KSP 1.7+")]
+[assembly: KSPAssembly ("KIS", 1, 20)]
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -4,4 +4,4 @@
 --github=ihsoft/KIS
 --versions=latest_all_builds
 --title=KIS {tag}
---archive=../KIS_v1.19.zip
+--archive=../KIS_v1.20.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=KIS v{tag}
---archive=../KIS_v1.19.zip
+--archive=../KIS_v1.20.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --github=ihsoft/KIS
 --ksp_version=latest
---archive=../KIS_v1.19.zip
+--archive=../KIS_v1.20.zip