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
..
wrapper	build: Update dependency gradle to v7.4.2 (#3560)	2022-04-04 12:46:49 +02:00
libs.versions.toml	Merge branch 'v6' into v7	2022-06-16 15:25:33 +01:00