dordsor21 554efbb057 Merge branch 'v5' into v6 ... # Conflicts: # .github/CODEOWNERS # Bukkit/pom.xml # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java # Core/src/main/java/com/plotsquared/core/command/Alias.java # Core/src/main/java/com/plotsquared/core/command/HomeCommand.java # Core/src/main/java/com/plotsquared/core/command/Music.java # Core/src/main/java/com/plotsquared/core/listener/PlotListener.java # Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java # Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java # Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java # build.gradle		2020-09-11 15:44:04 +01:00
..
workflows	Update gradle.yml	2020-07-14 12:44:11 +02:00
auto-comment.yml	Update auto-comment.yml	2019-10-01 12:54:20 +02:00
CODEOWNERS	Create CODEOWNERS	2020-09-05 13:42:11 +02:00
dependabot.yml	Merge v5/v6	2020-09-02 16:44:18 +02:00
FUNDING.yml	Link issues to new issue tracker for legacy reasons	2020-05-23 01:25:18 +02:00
PULL_REQUEST_TEMPLATE.md	Update old links	2020-06-27 21:48:15 +02:00
stale.yml	Create stale.yml	2018-08-11 15:38:22 +02:00