Merge 2.8.4 #1
Merged
Merge 2.8.4 #1
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
Add exit bed teleport cause
Remove delayed task call around variable loading It is already in a delayed task.
* Explain luck perms group * Update ExprGroup.java
* Disable Timings for 1.19.4+ * Update SkriptConfig.java
Disable Timings for 1.19.4+ (SkriptLang#5917) * Disable Timings for 1.19.4+ * Update SkriptConfig.java (cherry picked from commit 7f38b86)
…SkriptLang#5932) Fix issue where mixing different types of conditionals sometimes isn't allowed (SkriptLang#5872) (cherry picked from commit 639bcf7) Co-authored-by: Pikachu920 <28607612+Pikachu920@users.noreply.github.com>
* Add defending for simple property expressions * Remove redundent javadoc --------- Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com>
…in EnumUtil's toString. (SkriptLang#6375)
…Lang#6391) * Update ExprPlain.java * Add regression test * Update src/test/java/org/skriptlang/skript/test/tests/regression/ExprPlainAliasTest.java Co-authored-by: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> --------- Co-authored-by: Pikachu920 <28607612+Pikachu920@users.noreply.github.com>
* Update Vault to 1.7.3 This version should support 1.13 to 1.17+ according to the Spigot page. I'm not sure what this actually adds but it's usually a good idea to keep dependencies updated and all 1.7.X versions of Vault are supposed to be compatible. :) * Do group request from another thread. This change is (basically) pointless -- we still block the main thread while we wait since we absolutely need to, but it prevents the errors from overzealous permissions plugins. * Invert parse tag. --------- Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* Fix timespan addition * Fix timespan-number multiplication --------- Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
…ng. (SkriptLang#6388) * Update Parameter.java * Update Parameter.java
…6392) * Fix Bucket event-block * Update src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
* 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 (SkriptLang#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
Merge dev/patch into master
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.