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

..

bukkit

Merge branch 'master' into feature/mapping

2014-06-28 22:31:13 -07:00

bukkit-test/java/com/sk89q

Added getUniqueId() to TestOfflinePermissible.

2014-04-05 20:09:20 -07:00

forge

Merge branch 'master' into feature/mapping

2014-06-28 22:31:13 -07:00

legacy/java/com/sk89q/worldedit

Standardized file headers.

2014-04-04 15:23:11 -07:00

main

Merge branch 'master' into feature/mapping

2014-06-28 22:31:13 -07:00

spout

Implemented PlatformManager, Platform over old platform registration method.

2014-04-04 20:53:58 -07:00

test/java/com/sk89q

Added a new Location and added Entity.getLocation().

2014-04-26 19:48:30 -07:00