Merge Changes from master to walshy/mc-1.21, bump Maven Javadoc Plugin. (branch: Compatibility/mc-1.21.4=master+walshy/mc-1.21, Second Attempt) #4292
+261
−79
Conversation
This file contains 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
Co-authored-by: Daniel Walsh <[email protected]>
…fun#4244) * Add simple `BlockPosition` based helpers for BlockStorage to help ease the transition between `Location` and `BlockStorage` * Fix build.
…-plugin to v3.11.0.3922
…ingLocations (Slimefun#4173) Fixes Slimefun#3696 Fixes Slimefun#4216
github-actions
bot
added
the
🤝 Compatibility
|
Your Pull Request was automatically labelled as: "🤝 Compatibility" |
This was referenced Feb 9, 2025
Open
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.
Warning
This Pull has been rewritten due to a mistake. it was supposed to be
walshy/mc-1.21,not master.Original Pull: #4291, Current: #4292
Description
the Merge Conflict has occurred on #4248.
merging the branch
compatibility/mc-1.21.4may resolve the stalemate.Proposed changes
bump Maven Javadoc Plugin making it same as master.
Related Issues (if applicable)
Resolves Merge Conflict.
Checklist
NonnullandNullableannotations to my methods to indicate their behaviour for null values