Add new government frames, prepare release 2.5.0

rquinio · Jan 27, 2018 · 7b1b638 · 7b1b638
1 parent fe44252
commit 7b1b638
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,9 @@
 By Romulien:
 
-Version 2.x - 2018-?
+Version 2.5.0 - 2018-01-27
 
 - Add labels for new vanilla 2.8 properties (p14 makeup, p15 makeup2, p16 jewelry and p17 immortality)
+- Add new 2.8 government frames
 - Allow selection of characteristics to update when clicking randomize button
 - Read mod directory from userdir.txt file in Steam CK2 folder, if any
 - Prevent crash when mod directory doesn't exist

diff --git a/PortraitBuilder/Engine/PortraitRenderer.cs b/PortraitBuilder/Engine/PortraitRenderer.cs
@@ -19,7 +19,7 @@ public class PortraitRenderer {
 
 		private static readonly ILog logger = LogManager.GetLogger(typeof(PortraitRenderer).Name);
 
-		private static String[] governmentSpriteSuffix = new String[] { "", "_iqta", "_theocracy", "_republic" , "_merchantrepublic", "_tribal", "_nomadic"};
+		private static String[] governmentSpriteSuffix = new String[] { "", "_iqta", "_theocracy", "_republic", "_merchantrepublic", "_tribal", "_nomadic", "_theocraticfeudal", "_chineseimperial", "_confucian" };
 
 		/// <summary>
 		/// Draws a character portrait.

diff --git a/PortraitBuilder/Properties/AssemblyInfo.cs b/PortraitBuilder/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // 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("2.4.0")]
-[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs b/PortraitBuilder/UI/PortraitBuilderForm.Designer.cs