Sync 1.21.1/dev with 26.1 implementation#237
Open
rsdadada wants to merge 8 commits into
Open
Conversation
- Merged disableWhenSneaking and disableWhenCrawling setting, added disableWhenFlying
* Added compatibility with Entity_Model_Features * Fix: Update issue template
* Fix live disable draft preview * Apply suggestion from @xTracr Co-authored-by: xTracr <57320980+xTracr@users.noreply.github.com> Signed-off-by: rsdadada <rsddadada@outlook.com> * Inline disable preview config overlay * Simplify live disable draft handling * Remove redundant disable draft helper --------- Signed-off-by: rsdadada <rsddadada@outlook.com> Co-authored-by: xTracr <57320980+xTracr@users.noreply.github.com>
Signed-off-by: dqsk_zze <1935752350@qq.com>
Signed-off-by: dqsk_zze <1935752350@qq.com>
rsdadada
marked this pull request as ready for review
July 19, 2026 06:56
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
4 participants
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.
Summary
26.1/devinto1.21.1/devwith a real two-parent merge commit.Version-specific conflict resolution
Short2ReferenceMaps.singletonwith fastutil 8.5.12 while adopting the 26.1CODECSlookup design and removing the redundant codec alias.Validation
./gradlew clean build --console=plain --no-daemonBUILD SUCCESSFUL(26 actionable tasks: 24 executed, 2 up-to-date)test NO-SOURCE).Known upstream behavior
The
outTicktoexitTickrename and crawling/swimming configuration consolidation do not migrate legacy JSON values in26.1/dev. This PR intentionally keeps the source implementation unchanged; any migration should be fixed upstream first and then synchronized across version branches.