dordsor21 c83b13e374 Merge branch 'v6' into v7 ... # Conflicts: # Core/src/main/java/com/plotsquared/core/command/Chat.java # Core/src/main/java/com/plotsquared/core/command/Save.java # Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java # Core/src/main/java/com/plotsquared/core/plot/PlotArea.java # Core/src/main/java/com/plotsquared/core/util/MainUtil.java # Core/src/main/java/com/plotsquared/core/util/RegExUtil.java # build.gradle.kts # gradle/libs.versions.toml		2022-06-16 15:25:33 +01:00
..
java/com/plotsquared/bukkit	Merge branch 'v6' into v7	2022-06-16 15:25:33 +01:00
resources	feat: Add border bypass permission (#3302)	2021-10-28 10:13:36 +02:00