Manual Cherry-pick needed: 8d096ea33ab0eab8b41da8294f9dd0f03c26b4f6#93
Closed
github-actions[bot] wants to merge 622 commits into1.16.5from
Closed
Manual Cherry-pick needed: 8d096ea33ab0eab8b41da8294f9dd0f03c26b4f6#93github-actions[bot] wants to merge 622 commits into1.16.5from
github-actions[bot] wants to merge 622 commits into1.16.5from
Conversation
…ction for enhanced block entity lookup
…d block entity wrapper in NeighborUpdateEvent
…lean properties in block states
…il and CompatItemDisplayContext # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java
…il and CompatItemDisplayContext # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java
…or for enhanced text styling
…d particle handling
…ty and DirectionBoolPropertyUtil
…classes and add utility methods for BlockState
…lacement validation
…patEntity and PosUtil
…_OAK_LEAVES and NOTE types respectively
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of 8d096ea from 1.21.1 to 1.16.5 failed due to conflicts.