Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.36 MERCIA #482

Merged
merged 3 commits into from
Nov 6, 2023
Merged

1.36 MERCIA #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd36184
1.36 MERCIA
Zemurin Nov 6, 2023
7b48a93
Merge branch 'master' of github_ck2toeu4:Zemurin/CK2ToEU4
Zemurin Nov 6, 2023
31ea92c
units
Zemurin Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/windows_build_test_and_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ jobs:
- name: "Prepare release"
run: |
cd "C:\Program Files\7-Zip\"
.\7z.exe a $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Leon-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
cp $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Leon-win-x64.zip $Env:GITHUB_WORKSPACE\CK2ToEU4-latest-win-x64.zip
.\7z.exe a $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Mercia-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
cp $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Mercia-win-x64.zip $Env:GITHUB_WORKSPACE\CK2ToEU4-latest-win-x64.zip

- name: "Prepare installer"
run: |
c:\"Program Files (x86)\Inno Setup 6\iscc" CK2ToEU4-Installer.iss
cp $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-1.0Leon-win-x64.exe
cp $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-1.0Mercia-win-x64.exe

- name: "Upload binaries to release"
if: ${{ github.event_name == 'push' }}
Expand All @@ -61,7 +61,7 @@ jobs:
allowUpdates: true
omitBodyDuringUpdate: true
omitNameDuringUpdate: true
artifacts: CK2ToEU4-1.0Leon-win-x64.zip, Output\CK2ToEU4-1.0Leon-win-x64.exe
artifacts: CK2ToEU4-1.0Mercia-win-x64.zip, Output\CK2ToEU4-1.0Mercia-win-x64.exe
token: ${{ secrets.API_TOKEN_GITHUB }}

- name: "Upload binaries to archive"
Expand All @@ -72,7 +72,7 @@ jobs:
allowUpdates: true
omitBodyDuringUpdate: true
omitNameDuringUpdate: true
artifacts: CK2ToEU4-1.0Leon-win-x64.zip, CK2ToEU4-latest-win-x64.zip, Output\CK2ToEU4-1.0Leon-win-x64.exe, Output\CK2ToEU4-latest-win-x64.exe
artifacts: CK2ToEU4-1.0Mercia-win-x64.zip, CK2ToEU4-latest-win-x64.zip, Output\CK2ToEU4-1.0Mercia-win-x64.exe, Output\CK2ToEU4-latest-win-x64.exe
token: ${{ secrets.API_TOKEN_GITHUB }}

- name: "Cleanup"
Expand Down
2 changes: 1 addition & 1 deletion CK2ToEU4-Installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "CK2 to EU4"
#define MyAppVersion "1.0 de Leon"
#define MyAppVersion "1.0 of Mercia"
#define MyAppPublisher "Paradox Game Converters Group"
#define MyAppURL "https://paradoxgameconverters.com/"
#define MyAppExeName "ConverterFrontend.exe"
Expand Down
2 changes: 1 addition & 1 deletion CK2ToEU4/Data_Files/blankMod/output/common/countries/Haruriyyah.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ historical_units = {
persian_footsoldier
persian_cavalry_charge
persian_shamshir
qizilbash_cavalry
qizilbash_cavalry_unit
tofongchis_musketeer
topchis_artillery
afsharid_reformed
Expand Down
2 changes: 1 addition & 1 deletion CK2ToEU4/Data_Files/blankMod/output/common/countries/Immortals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ historical_units = {
persian_footsoldier
persian_cavalry_charge
persian_shamshir
qizilbash_cavalry
qizilbash_cavalry_unit
tofongchis_musketeer
topchis_artillery
afsharid_reformed
Expand Down
2 changes: 1 addition & 1 deletion CK2ToEU4/Data_Files/blankMod/output/common/countries/KnightsZun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ historical_units = {
persian_footsoldier
persian_cavalry_charge
persian_shamshir
qizilbash_cavalry
qizilbash_cavalry_unit
tofongchis_musketeer
topchis_artillery
afsharid_reformed
Expand Down
1 change: 1 addition & 0 deletions CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_order_of_saint_anthony_ideas.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ order_of_saint_anthony_ideas = {
}
ZZZ_mission_to_the_unknown = {
colonists = 1
effect = { remove_temporary_colonist = yes }
}
ZZZ_capacity_for_more = {
land_forcelimit_modifier = 0.25
Expand Down
1 change: 1 addition & 0 deletions CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_sons_of_kaleva_ideas.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ sons_of_kaleva_ideas = {
}
ZZZ_kalevan_expansion = {
colonists = 1
effect = { remove_temporary_colonist = yes }
}
ZZZ_take_down_the_walls = {
artillery_levels_available_vs_fort = 2
Expand Down
Loading