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
..
DatFileFilter.java	Tweaked some things	2016-06-02 13:42:32 -04:00
DefaultUUIDWrapper.java	Cleaning	2016-03-24 00:50:25 -04:00
FileUUIDHandler.java	Merge remote-tracking branch 'origin/master' into 3.4.5	2016-07-29 12:25:11 -04:00
LowerOfflineUUIDWrapper.java	Cleaning	2016-03-24 00:50:25 -04:00
OfflineUUIDWrapper.java	Bug Fix and Cleanup	2016-04-29 18:14:12 -04:00
SQLUUIDHandler.java	Always cache * uuid	2016-06-05 20:11:02 +10:00