chore: cherry-pick appropriate changes from upstream #3137
Merged
Conversation
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
Member
Author
|
Should probably not be squashed |
2 tasks
2 tasks
|
Please take a moment and address the merge conflicts of your pull request. Thanks! |
* Lazily compute BlockState#getAsString * Implement in BaseBlock
The `apply` term was inconsistent in this API, but should have always been the same. This makes the "set" actually store the state of the given effect, even if it's the default, and therefore consistent.
Biome broke in 1.21.3, Material could break in the future
This makes biome operations respect masks set on an EditSession.
Despite the description/doc stating that negative heights would generate inverted cones, this wasn't actually implemented.
Some servers track channel registration: NF throws an error every time this happens; Bukkit silently drops it; Fabric silently sends it (presumably the client ignores it).
* Added a brush for biomes * IntelliJ reformat * Move the warning * Update worldedit-core/src/main/resources/lang/strings.json Co-authored-by: Octavia Togami <octavia.togami@gmail.com> * Use BiomeFactory instead Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
* Add erosion brush * Rename to the Morph brush, and add Erode and Dilate presets Co-authored-by: Lewis B <lbobbermen@bigpond.com>
* Add a -c flag to the biome brush to set entire column * Use new region factories that take fixed positions * Rename to FixedHeight from just Fixed
* Start deprecating MultiStage reorder * Rather than changing behaviour just deprecate * Add deprecation message * Apply PR review notes
* Add API to disable history tracking in EditSessions * Update worldedit-core/src/main/java/com/sk89q/worldedit/extent/ChangeSetExtent.java Co-authored-by: Octavia Togami <octavia.togami@gmail.com> Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
dordsor21
force-pushed
the
chore/upstream-updates
branch
from
8db48ca to
d04a2a7
Compare
NotMyFault
approved these changes
Mar 30, 2025
NotMyFault
added a commit
that referenced
this pull request
Apr 5, 2025
This reverts commit ccc82bd.
NotMyFault
added a commit
that referenced
this pull request
Apr 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.