Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/docs' into docs
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/ch/njol/skript/doc/AvailableEvents.java
#	src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java
#	src/main/java/ch/njol/skript/expressions/ExprAppliedEffect.java
#	src/main/java/ch/njol/skript/expressions/ExprAppliedEnchantments.java
#	src/main/java/ch/njol/skript/expressions/ExprAttacked.java
#	src/main/java/ch/njol/skript/expressions/ExprAttacker.java
#	src/main/java/ch/njol/skript/expressions/ExprBeaconValues.java
#	src/main/java/ch/njol/skript/expressions/ExprClicked.java
#	src/main/java/ch/njol/skript/expressions/ExprCommand.java
#	src/main/java/ch/njol/skript/expressions/ExprCommandSender.java
#	src/main/java/ch/njol/skript/expressions/ExprDamage.java
#	src/main/java/ch/njol/skript/expressions/ExprEgg.java
#	src/main/java/ch/njol/skript/expressions/ExprEnchantItem.java
#	src/main/java/ch/njol/skript/expressions/ExprEnchantingExpCost.java
#	src/main/java/ch/njol/skript/expressions/ExprEnchantmentBonus.java
#	src/main/java/ch/njol/skript/expressions/ExprEnchantmentOffer.java
#	src/main/java/ch/njol/skript/expressions/ExprEvtInitiator.java
#	src/main/java/ch/njol/skript/expressions/ExprExperience.java
#	src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java
#	src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java
#	src/main/java/ch/njol/skript/expressions/ExprExplosionYield.java
#	src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java
#	src/main/java/ch/njol/skript/expressions/ExprFinalDamage.java
#	src/main/java/ch/njol/skript/expressions/ExprHatchingNumber.java
#	src/main/java/ch/njol/skript/expressions/ExprHatchingType.java
#	src/main/java/ch/njol/skript/expressions/ExprHealAmount.java
#	src/main/java/ch/njol/skript/expressions/ExprHealReason.java
#	src/main/java/ch/njol/skript/expressions/ExprHealth.java
#	src/main/java/ch/njol/skript/expressions/ExprHoverList.java
#	src/main/java/ch/njol/skript/expressions/ExprInventoryCloseReason.java
#	src/main/java/ch/njol/skript/expressions/ExprLevel.java
#	src/main/java/ch/njol/skript/expressions/ExprLevelProgress.java
#	src/main/java/ch/njol/skript/expressions/ExprMe.java
#	src/main/java/ch/njol/skript/expressions/ExprMessage.java
#	src/main/java/ch/njol/skript/expressions/ExprProtocolVersion.java
#	src/main/java/ch/njol/skript/expressions/ExprReadiedArrow.java
#	src/main/java/ch/njol/skript/expressions/ExprSentCommands.java
#	src/main/java/ch/njol/skript/expressions/ExprVersionString.java
  • Loading branch information
Nuutrai committed Mar 2, 2025
2 parents d4f3564 + 2857590 commit 4326b22
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4326b22

Please sign in to comment.