2 Commits

Author SHA1 Message Date
sk89q
b0d050451a Merge branch 'master' into feature/mapping
Conflicts:
	src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
	src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java
	src/main/java/com/sk89q/worldedit/util/TargetBlock.java
2014-06-28 22:31:13 -07:00
Wizjany
0e00f0ac9d [Forge] Move worldedit.properties to defaults folder so it extracts properly 2014-06-26 17:26:30 -04:00