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 #4

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Update #4

merged 6 commits into from
Jan 4, 2024

Conversation

CorruptedGreed
Copy link
Member

No description provided.

LlmDl and others added 6 commits January 3, 2024 09:50
are involved.
    - Closes #7159.
  - New Config Option:
claiming.overclaiming.nations_required_to_be_enemies
    - Default: false
    - When true, when the towns involved in the overclaiming both have
nations, the overclaiming town's nation will have to have the
overclaimed town's nation declared as an enemy.
    - Towns with no nation are not affected by this rule.
* Make plot groups extend townyobject

* Save metadata
* New translations en-us.yml (Chinese Simplified)

* New translations en-us.yml (German)

* New translations en-us.yml (Romanian)

* New translations en-us.yml (French)

* New translations en-us.yml (Spanish)

* New translations en-us.yml (Bulgarian)

* New translations en-us.yml (Czech)

* New translations en-us.yml (Danish)

* New translations en-us.yml (Hebrew)

* New translations en-us.yml (Italian)

* New translations en-us.yml (Japanese)

* New translations en-us.yml (Korean)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Dutch)

* New translations en-us.yml (Norwegian)

* New translations en-us.yml (Polish)

* New translations en-us.yml (Portuguese)

* New translations en-us.yml (Russian)

* New translations en-us.yml (Albanian)

* New translations en-us.yml (Swedish)

* New translations en-us.yml (Turkish)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Chinese Traditional)

* New translations en-us.yml (Vietnamese)

* New translations en-us.yml (Portuguese, Brazilian)

* New translations en-us.yml (Indonesian)

* New translations en-us.yml (Spanish, Argentina)

* New translations en-us.yml (Spanish, Chile)

* New translations en-us.yml (Spanish, Mexico)

* New translations en-us.yml (Spanish, Uruguay)

* New translations en-us.yml (Spanish, Venezuela)

* New translations en-us.yml (Spanish, Ecuador)

* New translations en-us.yml (Thai)

* New translations en-us.yml (Azerbaijani)

* New translations en-us.yml (English, United Kingdom)

* New translations en-us.yml (Tagalog)

* New translations en-us.yml (Pirate English)

* New translations en-us.yml (Serbian (Latin))

* New translations en-us.yml (English (upside down))

* New translations en-us.yml (LOLCAT)

* New translations en-us.yml (Classical Chinese)

* New translations en-us.yml (Russian)

* New translations en-us.yml (Russian)

* New translations en-us.yml (Japanese)

* New translations en-us.yml (Japanese)
Bumps org.apache.logging.log4j:log4j-core from 2.22.0 to 2.22.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
with PR #7158.
  - Make plot groups extend townyobject, courtesy of Warrior with
PR #7141.
    - Closes #6092.
  - Bump org.apache.logging.log4j:log4j-core from 2.22.0 to 2.22.1.
@CorruptedGreed CorruptedGreed merged commit 9f8afb4 into EarthMC:fork Jan 4, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants