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.

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

Update to global 1940 maps #13142

Merged
merged 5 commits into from
Feb 15, 2025
Merged

Update to global 1940 maps #13142

merged 5 commits into from
Feb 15, 2025

Conversation

simon33-2
Copy link
Contributor

Notes to Reviewer

Version 2 of French Rebalance (renamed from Parisian Rebalance)
Version 4 of Balanced Mod for the Move 1st version
Move 1st versions now post from the Purchase phase in PBEM/PBF

@CLAassistant
Copy link

CLAassistant commented Jan 25, 2025

CLA assistant check
All committers have signed the CLA.

@beelee1
Copy link
Contributor

beelee1 commented Jan 26, 2025

@simon33-2 gotta sign the thing I guess :) I don't mind updating existing maps when the only thing that changed is the version number, as is the case here.

Last couple times I did new ones, it shut the lobby down or prevented map downloads. Don't really want to do those anymore. Was hoping someone more knowledgeable than me would.

I guess I could do the revert but if it doesn't work, not really anyone around that frequently to deal with it.

beelee1 and others added 2 commits February 13, 2025 08:10
Fix BM Marines Not Loading and Archangel Lend Lease Objective Firing in Rd 2
Adding Hellas Athens vs. Sparta (beta). Making sure that there will not be colons used in the mapName
@simon33-2
Copy link
Contributor Author

Merging is blocked? I can't see the reason.

@simon33-2
Copy link
Contributor Author

What is needed to get this change done?

@simon33-2
Copy link
Contributor Author

Hold on, did I stuff this up? I really just wanted to merge in the change to the global version number. But it is still saying merging is blocked.

@beelee1 beelee1 merged commit 214f126 into triplea-game:master Feb 15, 2025
1 check passed
@simon33-2 simon33-2 deleted the private branch February 15, 2025 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants