Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline

 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
This commit is contained in:
MattBDev
2019-11-02 15:58:46 -04:00
220 changed files with 8294 additions and 5283 deletions

View File

@ -110,6 +110,15 @@ public class UtilityCommands {
this.we = we;
}
@Command(
name = "/macro",
desc = "Generate or run a macro"
)
@CommandPermissions("worldedit.macro")
public void macro(Player player, LocalSession session, String name, String argument) throws IOException {
}
@Command(
name = "/heightmapinterface",
desc = "Generate the heightmap interface: https://github.com/boy0001/HeightMap"
@ -420,7 +429,7 @@ public class UtilityCommands {
@Command(
name = "replacenear",
aliases = { "/replacenear" },
aliases = { "/replacenear", "/rn" },
desc = "Replace nearby blocks"
)
@CommandPermissions("worldedit.replacenear")