Skip to content

Commit ee2e131

Browse files
committed
Merge branch 'master' into invictus-compatch
2 parents 3129a41 + 7e711ac commit ee2e131

18 files changed

+14100
-123
lines changed

.github/workflows/build_dev_version.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
name: Upload development build
2121
needs: remove_old_artifacts
2222
runs-on: ${{ matrix.os }}
23+
environment: "Build Environment"
2324
strategy:
2425
matrix:
2526
build:
@@ -44,9 +45,9 @@ jobs:
4445
with:
4546
global-json-file: Fronter.NET/global.json
4647
env:
47-
BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}'
48-
BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}'
49-
BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}'
48+
BACKBLAZE_KEY_ID: ${{ secrets.BACKBLAZE_KEY_ID }}
49+
BACKBLAZE_APPLICATION_KEY: ${{ secrets.BACKBLAZE_APPLICATION_KEY }}
50+
BACKBLAZE_BUCKET_ID: ${{ secrets.BACKBLAZE_BUCKET_ID }}
5051
- name: "Replace frontend background image"
5152
run: |
5253
rm Fronter.NET/Fronter.NET/Assets/Images/background.png

.github/workflows/create_release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
add_release_archive:
3434
needs: create_release
3535
runs-on: ${{ matrix.os }}
36+
environment: "Build Environment"
3637
strategy:
3738
fail-fast: false
3839
matrix:
@@ -80,9 +81,9 @@ jobs:
8081
fronter_dir: 'Fronter.NET'
8182
release_dir: 'Publish'
8283
env:
83-
BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}'
84-
BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}'
85-
BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}'
84+
BACKBLAZE_KEY_ID: ${{ secrets.BACKBLAZE_KEY_ID }}
85+
BACKBLAZE_APPLICATION_KEY: ${{ secrets.BACKBLAZE_APPLICATION_KEY }}
86+
BACKBLAZE_BUCKET_ID: ${{ secrets.BACKBLAZE_BUCKET_ID }}
8687
- name: "Setup Dotnet for use with actions"
8788
uses: actions/setup-dotnet@v3
8889
with:

ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
1919
<PackageReference Include="FluentAssertions" Version="6.11.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
2121
<PackageReference Include="xunit" Version="2.5.0" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ImperatorToCK3/Data_Files/blankMod/output/common/culture/name_lists/IRToCK3_zz_whatif.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ name_list_romano-sanskrit = {
1515
Krassa Krīspīna Krīspa Kullea Kūri Kursori Kuru
1616
Dentāta Denteri Dentoni Dīuiti Dolābella Dorsuoni Drūsa
1717
Phigula Phimbri Phlakka Phlāu Phlora Phrontoni Phulloni
18-
Phūsa Galeoni Gemella Glabrioni Grakkha Gurgīti Habita
19-
Helu Imperiosa Iulla Labea Laktūka Laenāti Lānāta
18+
Phūsa Galeoni Gemella Glabrioni Grakkha GurgI_ti Habita
19+
Helu Imperiosa Iulla Labea Laktūka LaenA_ti Lānāta
2020
Laeuīni Laterensi Lentula Lepida Liboni Likina Longa
2121
Lūkulla Lupa Lurkoni Makri Makula Malleola Māmerka
2222
Mārkella Maroni Merenda Merga Merula Messalla Metella
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IRToCK3_create_maa = {
22
scope = character
33

4-
ai_is_valid = { always = no }
4+
is_valid = { is_ai = no }
55
is_shown = { has_global_variable = IRToCK3_create_maa_flag }
66
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
l_english:
22
IRToCK3_aesthetics_anatolian_name: "$anatolian$"
33
IRToCK3_aesthetics_euxinian_name: "$euxinian$"
4-
IRToCK3_aesthetics_hyperborean_name: "$hyperborean$"
4+
IRToCK3_aesthetics_hyperborean_name: "$hyperborean$"

ImperatorToCK3/Data_Files/blankMod/output/localization/english/ir_names_l_english.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5062,3 +5062,7 @@
50625062
Zanidah: "Zanidah"
50635063
Kikki: "Kikki"
50645064
Napir-Asu: "Napir-Asu"
5065+
5066+
# Romano-Sanskrit
5067+
GurgI_ti: "Gurgīti"
5068+
LaenA_ti: "Laenāti"

0 commit comments

Comments
 (0)