Skip to content

Squash and Reconcile from fork, 1.21.3 also #240

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

Jump to bottom
Merged
merged 14 commits into from
Nov 24, 2024
Merged

Squash and Reconcile from fork, 1.21.3 also #240

merged 14 commits into from
Nov 24, 2024
+1,758 −416

Conversation

sakura-ryoko
Copy link
Contributor

@sakura-ryoko sakura-ryoko commented Nov 17, 2024 •
edited
Loading

  • Various code cleanups & better i18n support with some optional Crowdin files that can be added.
  • Fixes / replaces basic "modid.png" with logo from Modrinth, and corrects ModMenu display integration.
  • Moves Configs and Hotkeys / Keybind callbacks to their own classes with new .apply() method for MaLiLib configs.
  • Fixes 'Logging / Debugging' system with a proper logger, and related printDebug config.
  • Uses Jitpack for 1.21.3 builds for Litematica / MaLiLib based on my repos.

aleksilassila and others added 7 commits November 17, 2024 02:31
@aleksilassila @sakura-ryoko
Merge pull request aleksilassila#188 from bruned12/printer-1.20.1-3.2.1
0ae02d0 
Fix cant place slab

(cherry picked from commit 2357b37)
@sakura-ryoko
Merge branch 'master' of https://github.com/sakura-ryoko/litematica-p…
fff4dd4 
…rinter
@sakura-ryoko @TNTsky
Squash From Reconciliation 1.21.3 (#5)
c66a06e 
* 1.20.2 folder only, no KTS

* Update .gitignore

* update version getter

* Update Guides.java

* add PR from DarkReaper231 and bruned12

* 1.20.3 basic

* remove "v1_20_2" from path

* some cleanup

* beta.1 versioning

* disable update check

* libs updates

* Update README.md

* cursemaven & official litematica 1.20.4

* Delete libs directory

* gradle update

* Update README.md

* Update fabric.mod.json

* Update README.md

* Update README.md

* Update to 1.20.6

* Update gradle.properties

* 1.21 dev (#1)

* 23w51b-snapshot

* Update README.md

* Update README.md

* IntelliJ updates

* 24w04a snapshot - no changes needed

* 24w09a snapshot

* 24w10a snapshot

* 24w13a - gradle 8.6, loom 1.6, yarn build 7, api 0.96.13

* 24w13a - Cleanup printer debug logger, add "printerDebug" setting to enable/disable printer debug logging from Litematica Config.

* 24w13a - Update mod icon and ModMenu dependency

* 24w13a - Update mod icon and ModMenu dependency

* 24w13a - update ModMenu Dependency to a custom SNAPSHOT build, because 10.0.0-alpha.3 does not support 24w13a correctly.

* 24w14a - java 21

* 24w14a - minor changes

* 24w14a - gradle 8.7, yarn build 6

* 1.20.5-pre.1 support -- rename mod_version to 3.4.0-beta.1

* yarn build 4

* 1.20.5-pre.1 - yarn build 5

* 1.20.5-pre.2 support

* 1.20.5-pre.3 support

* 1.20.5-pre.4 support

* 1.20.5-rc.1

* 1.20.5-rc2

* 1.20.5-rc3

* 1.20.5-DEV

* "sakura.1" branding until official

* "sakura.1" branding until official

* 1.20.5-sakura.2

* 1.20.6 versioning

* version bump

* 24w19b support

* 24w20a build 3, waiting on FAPI

* FAPI / ModMenu update

* Update fabric.mod.json

* 1.21-pre1

* 1.21-pre2

* Create jitpack.yml

* Delete jitpack.yml

* Mod Menu update

* 1.21-pre3

* jitpack

* Update build.yml

* 1.21-pre4

* 1.21-rc1

* 1.21-rc1

* 1.21-rc1

* 1.21-rc1

* resync

* 1.21

* Update gradle.properties

* version update

* version bumps

* Update README.md

* Update README.md

* bump malilib version to 0.20.0

* add 1.21 i18n support

* Add Chinese (Traditional) translation (#2)

* update fabric.mod.json

* Merge from DEV (#3)

* Port to 1.21.2-pre1

* port to pre3

* Port to 1.21.2 REL

* Update fabric.mod.json

* Update fabric.mod.json

* Update fabric.mod.json

* Update fabric.mod.json

* 1.21.3

* Just some code reformatting / cleanup

* Move towards reconciliation with upstream

* Move towards reconciliation with upstream

* Move towards reconciliation with upstream

* Move towards reconciliation with upstream

* Update Crowdin configuration file

* New Crowdin updates (#4)

* New translations en_us.json (Romanian)

* New translations en_us.json (French)

* New translations en_us.json (Spanish)

* New translations en_us.json (Afrikaans)

* New translations en_us.json (Arabic)

* New translations en_us.json (Catalan)

* New translations en_us.json (Czech)

* New translations en_us.json (Danish)

* New translations en_us.json (German)

* New translations en_us.json (Greek)

* New translations en_us.json (Finnish)

* New translations en_us.json (Hebrew)

* New translations en_us.json (Hungarian)

* New translations en_us.json (Italian)

* New translations en_us.json (Japanese)

* New translations en_us.json (Korean)

* New translations en_us.json (Dutch)

* New translations en_us.json (Norwegian)

* New translations en_us.json (Polish)

* New translations en_us.json (Portuguese)

* New translations en_us.json (Russian)

* New translations en_us.json (Serbian (Cyrillic))

* New translations en_us.json (Swedish)

* New translations en_us.json (Turkish)

* New translations en_us.json (Ukrainian)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (Chinese Traditional)

* New translations en_us.json (Vietnamese)

* New translations en_us.json (Portuguese, Brazilian)

* New translations en_us.json (Romanian)

* New translations en_us.json (French)

* New translations en_us.json (Spanish)

* New translations en_us.json (Afrikaans)

* New translations en_us.json (Arabic)

* New translations en_us.json (Catalan)

* New translations en_us.json (Czech)

* New translations en_us.json (Danish)

* New translations en_us.json (German)

* New translations en_us.json (Greek)

* New translations en_us.json (Finnish)

* New translations en_us.json (Hebrew)

* New translations en_us.json (Hungarian)

* New translations en_us.json (Italian)

* New translations en_us.json (Japanese)

* New translations en_us.json (Korean)

* New translations en_us.json (Dutch)

* New translations en_us.json (Norwegian)

* New translations en_us.json (Polish)

* New translations en_us.json (Portuguese)

* New translations en_us.json (Russian)

* New translations en_us.json (Serbian (Cyrillic))

* New translations en_us.json (Swedish)

* New translations en_us.json (Turkish)

* New translations en_us.json (Ukrainian)

* New translations en_us.json (Chinese Simplified)

* New translations en_us.json (Chinese Traditional)

* New translations en_us.json (Vietnamese)

* New translations en_us.json (Portuguese, Brazilian)

* update with Crowdin Optional lang files

* Update README.md

* Update gradle.properties

---------

Co-authored-by: TNTsky <[email protected]>
@sakura-ryoko
move to javax annotations
349d782
@sakura-ryoko
Update Configs.java
b611d4d
@sakura-ryoko
Update build.yml
1bcfe80
@sakura-ryoko
Update Crowdin configuration file
fcec7cd
@sakura-ryoko sakura-ryoko marked this pull request as draft November 17, 2024 20:35
@sakura-ryoko
Copy link
Contributor Author

sakura-ryoko commented Nov 17, 2024 •
edited
Loading

Working on more Crowdin items across the mod ecosystem (Masa's Mods and related)

sakura-ryoko and others added 3 commits November 17, 2024 22:12
@sakura-ryoko
Update Crowdin configuration file
016a765
@sakura-ryoko
New Crowdin updates (#7)
3cf55b2 
* New translations en_us.json (Hebrew)

* New translations en_us.json (Hungarian)

* New translations en_us.json (Swedish)

* New translations en_us.json (Ukrainian)

* New translations en_us.json (Vietnamese)
@sakura-ryoko
add some langs from crowdin
493af90
@sakura-ryoko sakura-ryoko marked this pull request as ready for review November 18, 2024 03:57
@aleksilassila aleksilassila self-assigned this Nov 18, 2024
@sakura-ryoko
Copy link
Contributor Author

sakura-ryoko commented Nov 23, 2024 •
edited
Loading

Obviously I might want to remove the jitpack and crowdin yml files... And sorry about the masa coding style bracing, it's just how my IDEA is configured.

@aleksilassila
Copy link
Owner

Very nice, thank you! Is this ready to merge?

@sakura-ryoko
Copy link
Contributor Author

Let me update the dependencies with my modrinth version builds

@sakura-ryoko
Copy link
Contributor Author

All done with that.

@aleksilassila aleksilassila merged commit 6f75320 into aleksilassila:master Nov 24, 2024
2 checks passed
@sakura-ryoko
Copy link
Contributor Author

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aleksilassila aleksilassila

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sakura-ryoko @aleksilassila