Jesse Boyd d89274ce09 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java

2016-09-17 16:03:57 +10:00

..

src/main/java/com/plotsquared/sponge

Merge remote-tracking branch 'origin/master'

2016-09-17 16:03:57 +10:00

build.gradle

Fix #1281 , Fix #1282 , and Sponge gradle

2016-07-29 12:47:42 -04:00