Merge branch 'v6' into v7

# Conflicts:
#	.github/workflows/codeql.yml
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Caps.java
#	Core/src/main/java/com/plotsquared/core/command/Cluster.java
#	Core/src/main/java/com/plotsquared/core/command/Continue.java
#	Core/src/main/java/com/plotsquared/core/command/Copy.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	build.gradle.kts
This commit is contained in:
dordsor21
2023-01-17 11:51:39 +00:00
84 changed files with 529 additions and 542 deletions

View File

@ -20,7 +20,7 @@ squirrelid = "0.3.1"
# Gradle plugins
shadow = "7.1.2"
grgit = "4.1.1"
spotless = "6.12.1"
spotless = "6.13.0"
nexus = "1.1.0"
[libraries]