Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared

Browse Source

Conflicts:
	src/main/java/com/intellectualcrafters/plot/IPlotMain.java
	src/main/java/com/intellectualcrafters/plot/commands/Trim.java
	src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
	src/main/java/com/plotsquared/bukkit/BukkitMain.java
	src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
	src/main/java/com/plotsquared/sponge/SpongeMain.java
	src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java

...

This commit is contained in:

boy0001

2015-09-13 13:46:45 +10:00

parent c163446f7e 063a369d8d

commit 1cccdd9d4d

10 changed files with 80 additions and 54 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

target/PlotSquared-Bukkit.jar

Binary file not shown.

BIN

target/PlotSquared-Sponge.jar

Binary file not shown.