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

Merge 1.20.5 into 1.21.1 #4534

Merged
merged 33 commits into from
Oct 30, 2024
Merged

Merge 1.20.5 into 1.21.1 #4534

merged 33 commits into from
Oct 30, 2024

Conversation

ZacSharp
Copy link
Collaborator

Includes

ZacSharp and others added 30 commits July 21, 2024 13:33
…ixinAndAsm

Sync mixin and asm versions between common and tweaker
The class doesn't even exist in the version of Litematica I'm using so it doesn't
seem to have an effect on descriptor strings in our bytecode. Otherwise my game
would crash.
…litematicaRework

Almost rewrite litematic handling
…ateAndMirrorSchematics

Add settings to rotate/mirror schematics
Fix not moving from edge of block
`minecraft:moving_piston` is the only block I currently know which could cause this to crash.
They also have to be removed rather than ignored because they won't be scanned
again and would stay in `incorrectPositions` indefinitely.
…EmptyShapeCrash

Don't call `shape.bounds()` on empty shapes
…PositionOutOfBounds

Handle positions going out of bounds between ticks
…WalkOnSoulSand

Allow walking on soul sand once again
@rfresh2 rfresh2 mentioned this pull request Oct 26, 2024
@leijurv leijurv merged commit 9eefcbc into cabaletta:1.21.1 Oct 30, 2024
3 of 4 checks passed
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.

3 participants