Merge branch 'master' into invictus-compatch

Author: IhateTrains

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [[self-hosted, windows], [self-hosted, linux], macos-latest]
+        os: [[self-hosted, windows], ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3

.github/workflows/build_dev_version.yml

@@ -43,6 +43,10 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         global-json-file: Fronter.NET/global.json
+      env:
+        BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}'
+        BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}'
+        BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}'
     - name: "Replace frontend background image"
       run: |
         rm Fronter.NET/Fronter.NET/Assets/Images/background.png

.github/workflows/create_release.yml

@@ -79,6 +79,10 @@ jobs:
       with:
         fronter_dir: 'Fronter.NET'
         release_dir: 'Publish'
+      env:
+        BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}'
+        BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}'
+        BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}'
     - name: "Setup Dotnet for use with actions"
       uses: actions/setup-dotnet@v3
       with:

Fronter.NET

@@ -17,9 +17,8 @@
  reitian_priests: "Klovetebos"
  reitian_priest: "Klovetes"
  reitian_priestess: "Klovetes"
- reitian_priests: "Klovetebos"
 
  retic_evil_god: "The Unholy Darkness"
 
  venetic_eternity: "Etarnos"
- venetic_hell: "Tartarnos"
+ venetic_hell: "Tartarnos"

ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_deities_l_english.yml

@@ -10,18 +10,6 @@
  select_personal_deity_venetic_decision.select_vetusa: "Vetusa, keeper of nature and master of the lands!"
  select_personal_deity_venetic_decision_confirm: "My choise is most wise"
 
- bhakti_germanic_reitia: "Devotee of Reitia"
- bhakti_germanic_reitia_desc: "This character's favored god is Reitia, goddess of writing, education and the all-Mother."
- bhakti_germanic_tumusiates: "Devotee of Tumusiates"
- bhakti_germanic_tumusiates_desc: "This character's favored god is Tumusiates, a god of honor, wisdom and statesmanship."
- bhakti_germanic_bouleno: "Devotee of Bouleno"
- bhakti_germanic_bouleno_desc: "This character's favored god is Bouleno, a god of cunning and bravery."
- bhakti_germanic_vetusa: "Devotee of Vetusa"
- bhakti_germanic_vetusa_desc: "This character's favored god is Vetusa, a goddess of protection, nature and animals."
-
- gave_written_offering_modifier: "Inscribed Gratitude to the Gods"
-
-
  written_offering_decision: "Make a Written Offering"
  written_offering_decision_tooltip: "Inscribing a Prayer"
  written_offering_decision_tt: "Inscribing a Prayer"
@@ -30,9 +18,4 @@
 
  doctrine_parameter_ritual_writing_active: "Allows #ERitual Inscriptions as gifts in exchange for piety"
 
- religious_decision.102.optout: "Maybe this was a bad idea"
- religious_decision.102.flavour: "I shouldn't invoke the wrath of many gods by choosing one"
-
- gave_written_offering: "Inscribed Gratitude to the Gods"
-
  ritual_writing_vassals: "Pleased Faithful"

ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_events_and_decisions_l_english.yml

@@ -8,22 +8,10 @@
  select_personal_deity_venetic_decision.select_bouleno: "鲍勒诺——老奸巨猾的战士！"
  select_personal_deity_venetic_decision.select_vetusa: "威涂莎——自然守护者与大地之主！"
  select_personal_deity_venetic_decision_confirm: "我的选择是最明智的"
- bhakti_germanic_reitia: "雷伊蒂亚信徒"
- bhakti_germanic_reitia_desc: "该角色偏爱的神是——司掌书写与教育的女神及万物之母。"
- bhakti_germanic_tumusiates: "特卢慕赛特斯信徒"
- bhakti_germanic_tumusiates_desc: "该角色偏爱的神是特卢慕赛特斯——荣耀，智慧与治国之神。"
- bhakti_germanic_bouleno: "鲍勒诺信徒"
- bhakti_germanic_bouleno_desc: "该角色偏爱的神是鲍勒诺——勇气与诡诈之神。"
- bhakti_germanic_vetusa: "威涂莎信徒"
- bhakti_germanic_vetusa_desc: "该角色偏爱的神是威涂莎——司掌保护，自然与动物的女神。"
- gave_written_offering_modifier: "题献对诸神的感谢"
  written_offering_decision: "献上文字"
  written_offering_decision_tooltip: "题献祷文"
  written_offering_decision_tt: "题献祷文"
  written_offering_decision_desc: "若我向诸神献上谢礼，他们必会友好看待我和我的人民。"
  written_offering_decision_confirm: "该提笔了！"
  doctrine_parameter_ritual_writing_active: "允许#ERitual 以题献献礼换取虔诚"
- religious_decision.102.optout: "也许这不是个好主意"
- religious_decision.102.flavour: "我不应因在诸神中选择一位而招致他们的愤怒"
- gave_written_offering: "题献对诸神的感谢"
  ritual_writing_vassals: "满意的信徒"

ImperatorToCK3/Data_Files/blankMod/output/localization/simp_chinese/from_venetic_mod/Ven_events_and_decisions_l_simp_chinese.yml

@@ -3,6 +3,8 @@ converterFolder = ImperatorToCK3
 backendExePath = ImperatorToCK3Converter
 displayName = IMPDISPLAYNAME
 
+sentryDsn = "https://9b108bcd89e348018522fc56be7ac112@o4505568167460864.ingest.sentry.io/4505568179257344"
+
 sourceGame = IMPGAME
 targetGame = CK3GAME
 

ImperatorToCK3/Data_Files/fronter_configuration/fronter-configuration.txt

@@ -32,7 +32,7 @@
     <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.2.0" />
     <PackageReference Include="NAudio" Version="2.1.0" />
     <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
-    <PackageReference Include="PGCG.commonItems" Version="8.1.5" />
+    <PackageReference Include="PGCG.commonItems" Version="8.1.6" />
     <PackageReference Include="PGCG.commonItems.SourceGenerators" Version="1.0.3" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
   </ItemGroup>