Merge branch 'main' into release

drewcassidy · Nov 17, 2020 · d8d3d4e · d8d3d4e
2 parents a6d5869 + 334af78
commit d8d3d4e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll
diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":2,
-        "PATCH":4,
+        "PATCH":5,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Conformal Decals v0.2.4
+# Conformal Decals v0.2.5
 [![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
 
 ![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png)

diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs
@@ -249,6 +249,9 @@ public class ModuleConformalText : ModuleConformalDecal {
                 decal.text = text;
                 decal.font = font;
                 decal.style = style;
+                decal.vertical = vertical;
+                decal.charSpacing = charSpacing;
+                decal.lineSpacing = lineSpacing;
 
                 decal._currentJob = _currentJob;
                 decal._currentText = _currentText;

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+v0.2.5
+------
+- Fixes:
+ - Fixed line spacing, character spacing, and vertical settings not applying to symmetry counterparts
+
 v0.2.4
 ------
 - Fixes: