PlotSquared/Bukkit/src/main/java/com/plotsquared/bukkit
Alexander Söderberg 198bcfdf4d
Merge branch 'v6' into feature/v6/json
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/build.gradle
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/command/Command.java
#	Core/src/main/java/com/plotsquared/core/command/ListCmd.java
#	Core/src/main/java/com/plotsquared/core/configuration/Caption.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/message/PlotMessage.java
#	Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-14 19:25:14 +02:00
..
entity Merge branch 'v6' into feature/v6/platform 2020-07-14 19:05:05 +02:00
generator Finalize DI stuff 2020-07-14 18:49:40 +02:00
inject Manually resolve a bunch of merge issues 2020-07-14 19:10:52 +02:00
listener Merge branch 'v5' into v6 2020-07-14 19:18:08 +02:00
managers Finalize DI stuff 2020-07-14 18:49:40 +02:00
placeholder Merge branch 'v6' into feature/v6/platform 2020-07-10 18:37:18 +02:00
player Merge branch 'v6' into feature/v6/json 2020-07-14 19:25:14 +02:00
queue Merge branch 'v5' into v6 2020-07-14 19:18:08 +02:00
schematic Finalize DI stuff 2020-07-14 18:49:40 +02:00
util Merge branch 'v6' into feature/v6/json 2020-07-14 19:25:14 +02:00
uuid Merge branch 'v6' into feature/v6/platform 2020-07-14 19:05:05 +02:00
BukkitCommand.java Provide no suggestions instead of player names for commands 2020-06-11 01:01:00 +02:00
BukkitPlatform.java Merge branch 'v6' into feature/v6/json 2020-07-14 19:25:14 +02:00