From d67c1c4c263517116b0a4c99863328d55deb66be Mon Sep 17 00:00:00 2001
From: IhateTrains <IhateTrains@users.noreply.github.com>
Date: Wed, 17 Mar 2021 00:23:34 +0100
Subject: [PATCH] Merged two workflows and fixed encoding in a blankMod file 
 (#169) #patch

* Merged two action files

* Fixed encoding in 00_divinity_custom_loc.txt
---
 .github/workflows/bump_version.yml            | 17 ------------
 ...ml => bump_version_and_create_release.yml} | 26 +++++++++++++------
 .../00_divinity_custom_loc.txt                |  1 +
 3 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/bump_version.yml
 rename .github/workflows/{create-release.yml => bump_version_and_create_release.yml} (55%)

diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml
deleted file mode 100644
index 951edcdec..000000000
--- a/.github/workflows/bump_version.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Bump version
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: '0'
-    - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DEFAULT_BUMP: patch
\ No newline at end of file
diff --git a/.github/workflows/create-release.yml b/.github/workflows/bump_version_and_create_release.yml
similarity index 55%
rename from .github/workflows/create-release.yml
rename to .github/workflows/bump_version_and_create_release.yml
index de7b7fb11..324a5f9e2 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/bump_version_and_create_release.yml
@@ -1,13 +1,23 @@
-name: Create Release
-
+name: Bump version and create release
 on:
   push:
-    tags:
-    - '*'
-
+    branches:
+      - master
 jobs:
-
-  build:
+  bump_tag:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: '0'
+    - name: Bump version and push tag
+      uses: anothrNick/github-tag-action@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DEFAULT_BUMP: patch
+        
+  create_release:
+    needs: bump_tag
     runs-on: windows-2019
     steps:
     - name: checkout
@@ -25,4 +35,4 @@ jobs:
       uses: ncipollo/release-action@v1
       with:
         artifacts: "Release.zip"
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/ImperatorToCK3/Data_Files/blankMod/output/common/customizable_localization/00_divinity_custom_loc.txt b/ImperatorToCK3/Data_Files/blankMod/output/common/customizable_localization/00_divinity_custom_loc.txt
index b87b5d9da..7e47b61bc 100644
--- a/ImperatorToCK3/Data_Files/blankMod/output/common/customizable_localization/00_divinity_custom_loc.txt
+++ b/ImperatorToCK3/Data_Files/blankMod/output/common/customizable_localization/00_divinity_custom_loc.txt
@@ -1,3 +1,4 @@
+# ImperatorToCK3: Last updated CK3 patch 1.2.2
 
 ToleranceValue = {
 	type = character