dordsor21 8cd54929e7 Merge branch 'master' into breaking ... # Conflicts: # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java # Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java # Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java # Core/src/main/java/com/intellectualcrafters/plot/config/C.java # Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java # Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java # Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java # Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java # README.md # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java # Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java		2018-11-14 14:44:07 +00:00
..
automerge.js	Reformat code	2018-08-10 17:01:11 +02:00
base.yml	Updated Gradle	2016-02-22 23:11:40 -05:00
bridge.template	Bridge template from the spigot page	2018-09-03 00:02:07 +02:00
de-DE.yml	Updated Simplified Chinese translation and formalized language codes.	2018-08-03 20:35:36 +08:00
es-ES.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
it-IT.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
ko-KR.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
LICENSE	Updated Gradle	2016-02-22 23:11:40 -05:00
plugin.properties	Various	2016-09-26 18:31:08 +10:00
skyblock.template	Updated Gradle	2016-02-22 23:11:40 -05:00
town.template	Updated Gradle	2016-02-22 23:11:40 -05:00
zh-CN.yml	Rename zh_CN.yml to zh-CN.yml	2018-10-10 16:51:43 +02:00