MattBDev 1f341e6ba9 Merge remote-tracking branch 'origin/master' into 3.4.5 ...

# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
#	Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
#	build.gradle

2016-07-29 12:25:11 -04:00

..

src/main

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

2016-07-29 12:25:11 -04:00

build.gradle

Remove metrics depend

2016-07-25 22:23:19 -04:00