Merge dev/patch into master #6517
Merged
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
* Fix entitydata consumer on 1.20.1 and older * Update aliases to master --------- Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* ExprAnvilText - fix docs * DefaultFunctions - better location examples --------- Co-authored-by: Moderocky <admin@moderocky.com>
* protect against bad amounts * Update ExprCharacters.sk .% * switch to Integer instead of Number and let chaos reign --------- Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Moderocky <admin@moderocky.com>
default.lang - add upcoming 1.20.5 attributes Co-authored-by: Moderocky <admin@moderocky.com>
* ItemData/BlockCompat - strip out BlockState middleman * ItemData/BlockCompat - add stuff back, but deprecate * ItemData/BlockCompat - Change a few things around * NewBlockCompat - getBlock at entity instead of forcing a chunk to load * Update src/main/java/ch/njol/skript/aliases/ItemType.java Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> --------- Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com>
* ExprIndices - fix strings not sorting alphabetically * ExprIndices - update method in ExprSortedList and use in this class * ExprIndices - forgot to get values * ExprSortedList - add a message to the error for better understanding --------- Co-authored-by: Moderocky <admin@moderocky.com>
… type (#6497) * Fix null pointer exception and add proper error message * Update src/main/java/ch/njol/skript/lang/SkriptParser.java Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> * change error message --------- Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com>
Bump version
AyhamAl-Ali
approved these changes
Apr 1, 2024
Moderocky
approved these changes
Apr 1, 2024
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.
Description
Target Minecraft Versions: any
Requirements: none
Related Issues: none