MattBDev e8f4eae6f7 Merge remote-tracking branch 'origin/3.4.5' into 3.4.5 ...

# Conflicts:
#	Sponge/build.gradle
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java

2016-07-29 21:45:34 -04:00

..

src/main/java/com/plotsquared/sponge

Merge remote-tracking branch 'origin/3.4.5' into 3.4.5

2016-07-29 21:45:34 -04:00

build.gradle

Fix #1281 , Fix #1282 , and Sponge gradle

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