Skip to content

Update en_us.json & ru_ru.json for fabric/1.21.1-3.0.0 branch #155

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

Merged
merged 6 commits into from
Jun 28, 2025

Conversation

mpustovoi
Copy link

@mpustovoi mpustovoi commented Mar 20, 2025

  • en_us.json:
    • Fixed nourishment & comfort descriptions for the general JEED and EMIffect format.
    • Added more c tags from 1.20.1 for parity (if it's unnecessary, I can roll it back). No tags were removed.
  • ru_ru.json:
    • Parity with en_us.json.
    • Fixed many legacy typos, that probably were already fixed in different branch or the base repo.
    • Added new c tags.

Fixed `nourishment` & `comfort` descriptions for the general `JEED` and `EMIffect` format.
Added more `c` tags from 1.20.1 for parity (if it's unnecessary, I can roll it back).
Parity with `en_us.json`.
Fixed many legacy typos, that probably were already fixed in different branch or the base repo.
Added new `c` tags.
@mpustovoi mpustovoi changed the title Update en_us.json & ru_ru.json Update en_us.json & ru_ru.json in fabric/1.21.1-3.0.0 Mar 20, 2025
@MerchantCalico
Copy link
Collaborator

MerchantCalico commented Mar 20, 2025

The 1.20.1 tags are entirely unnecessary, Addons/datapacks should not be using them + those tags were overengineered to hell, so you're free to remove them.

@mpustovoi mpustovoi marked this pull request as draft March 20, 2025 10:51
Removed unnecessary 1.20.1 tags.
Removed unnecessary 1.20.1 tags.
@mpustovoi mpustovoi marked this pull request as ready for review March 20, 2025 11:09
@mpustovoi mpustovoi changed the title Update en_us.json & ru_ru.json in fabric/1.21.1-3.0.0 Update en_us.json & ru_ru.json for fabric/1.21.1-3.0.0 branch May 19, 2025
@MerchantCalico
Copy link
Collaborator

MerchantCalico commented Jun 28, 2025

Will get to handling the conflicts and will merge today!

I apologize for the wait.

@MerchantCalico MerchantCalico self-requested a review June 28, 2025 06:56
@MerchantCalico MerchantCalico merged commit 0136b40 into MehVahdJukaar:fabric/1.21.1-3.0.0 Jun 28, 2025
@MerchantCalico MerchantCalico removed their request for review June 28, 2025 07:03
@mpustovoi mpustovoi deleted the patch-2 branch June 28, 2025 07:07
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.

2 participants