MattBDev 06a92d29b1 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java # worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java # worldedit-libs/core/build.gradle.kts		2019-09-02 15:24:53 -04:00
..
main	Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding	2019-09-02 15:24:53 -04:00
test/java/com/sk89q	fix dependencies	2019-08-26 05:45:03 +01:00