Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
drewcassidy committed Nov 17, 2020
2 parents a6d5869 + 334af78 commit d8d3d4e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 2 deletions.
Binary file modified GameData/ConformalDecals/Plugins/ConformalDecals.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"MAJOR":0,
"MINOR":2,
"PATCH":4,
"PATCH":5,
"BUILD":0
},
"KSP_VERSION":
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 3 additions & 0 deletions Source/ConformalDecals/ModuleConformalText.cs
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ private void UpdateTextRecursive() {
decal.text = text;
decal.font = font;
decal.style = style;
decal.vertical = vertical;
decal.charSpacing = charSpacing;
decal.lineSpacing = lineSpacing;

decal._currentJob = _currentJob;
decal._currentText = _currentText;
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit d8d3d4e

Please sign in to comment.