From dc01f277a9010f045f66fa9ca1a3fe768dd5f53f Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 3 May 2019 23:27:53 -0700 Subject: [PATCH 1/3] Start v1.20 pre-release --- CHANGELOG.md | 2 ++ Source/Properties/AssemblyInfo.cs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbff76d3..f6693a3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 1.20 (pre-release): + # 1.19 (May 2nd, 2019): * [Change] `KSP 1.7.*` compatibility. * [Change] Update ES-ES localization. diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 140ade18..2706f93e 100644 --- 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)] From 0458f3b05369127214f712a1ccb120b82aadda5c Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 3 May 2019 23:57:57 -0700 Subject: [PATCH 2/3] Fix #326 Explicitly set genetive in English localization to preven `'s` expansion. --- CHANGELOG.md | 1 + Lang/en-us.cfg | 2 +- Source/ModuleKISInventory.cs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6693a3f..b2d21e9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # 1.20 (pre-release): +* [Fix #326] Text formating in PAW menu. # 1.19 (May 2nd, 2019): * [Change] `KSP 1.7.*` compatibility. diff --git a/Lang/en-us.cfg b/Lang/en-us.cfg index 69b5beac..73d09468 100644 --- 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 = <>'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 index d95f5400..347d1288 100644 --- a/Source/ModuleKISInventory.cs +++ b/Source/ModuleKISInventory.cs @@ -214,7 +214,7 @@ public class ModuleKISInventory : PartModule, static readonly Message PersonalInventoryMenuTxt = new Message( "#kisLOC_00030", - defaultTemplate: "<<1>>`s inventory", + defaultTemplate: "<>\'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."); From 271c76c096b7880bcf209df199b450f8e38235b8 Mon Sep 17 00:00:00 2001 From: ihsoft Date: Sat, 4 May 2019 00:27:45 -0700 Subject: [PATCH 3/3] Release v1.20 --- CHANGELOG.md | 2 +- KIS.version | 6 +++--- Tools/publish_curseforge_args.txt | 2 +- Tools/publish_github_args.txt | 2 +- Tools/publish_spacedock_args.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2d21e9b..cca44d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.20 (pre-release): +# 1.20 (May 3rd, 2019)): * [Fix #326] Text formating in PAW menu. # 1.19 (May 2nd, 2019): diff --git a/KIS.version b/KIS.version index 14d9c4aa..b2e49a73 100644 --- 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 } } \ No newline at end of file diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt index c605b1f8..535669a7 100644 --- 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 index f6e51c24..e1f70eaf 100644 --- 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 index 527990e6..2ca265d7 100644 --- 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