Matt 09ee7f3048 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java # Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java # Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java # Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java # Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java		2016-03-20 23:03:31 -04:00
..
ArrayWrapper.java	Updated Gradle	2016-02-22 23:11:40 -05:00
FancyMessage.java	Code Style Cleanup	2016-03-20 22:52:16 -04:00
JsonRepresentedObject.java	Updated Gradle	2016-02-22 23:11:40 -05:00
JsonString.java	Updated Gradle	2016-02-22 23:11:40 -05:00
MessagePart.java	Various changes	2016-03-14 02:18:04 -04:00
Reflection.java	Cleanup	2016-03-19 14:07:55 -04:00
TextualComponent.java	Cleanup	2016-03-20 19:35:40 -04:00