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
NotMyFault
ae2869a29b
Translation update and fixing wrong lines
2018-11-05 16:00:44 +01:00
NotMyFault
1734c0e357
Rename ko_KR.yml to ko-KR.yml
2018-10-10 16:52:35 +02:00
NotMyFault
e2e34f24d6
Rename zh_CN.yml to zh-CN.yml
2018-10-10 16:51:43 +02:00
NotMyFault
e1e6d95f75
Merge pull request #2049 from f0rb1d/master
...
Updated Simplified Chinese translation and formalized language codes.
2018-10-10 16:40:52 +02:00
NotMyFault
5b2428559a
Bridge template from the spigot page
2018-09-03 00:02:07 +02:00
sauilitired
1646cd0f5a
Reformat code
2018-08-10 17:01:11 +02:00
F0rb1d
a4f176fd07
Updated Simplified Chinese translation and formalized language codes.
2018-08-03 20:35:36 +08:00
NotMyFault
244ccb71cf
Update of german.yml
...
german.yml design has been reworked to the up-to-date PlotSquared language file design. Many lines were added and adjusted.
2018-05-11 20:37:50 +02:00
NotMyFault
e13785edfe
Typo fixes
...
Had to write some custom messages for a server and fixed the typos in here
2018-05-11 00:03:35 +02:00
Leomixer17
ef6b1cb932
Update italian.yml
2018-05-01 01:29:18 +02:00
bibo38
fb706e0d60
Fixed wrong newlines in german language file
2018-03-16 18:07:29 +01:00
Leomixer17
47314ce00d
Update italian.yml
2017-12-10 15:28:35 +01:00
Leomixer17
452bf593e0
Update italian.yml
2017-12-10 14:35:43 +01:00
Leomixer17
a9bd6566b7
Update italian.yml
2017-12-10 12:53:22 +01:00
Leomixer17
48bdfd75e5
Update italian.yml
2017-12-07 19:50:02 +01:00
Leomixer17
61e045aa50
Update italian.yml ( #1789 )
2017-12-04 17:02:11 +01:00
Leomixer17
9daf13c897
Update italian.yml
2017-12-03 21:13:39 +01:00
Christian Langel
7d39d09317
fix: remove plot-alias with "/p alias" ( #1779 )
...
* fix: remove plot-alias with "/p alias"
remove plot-alias with "/p alias" #1718
* Apply requested Review Changes
Restored the original Permisson to keep backwards compatibility
Clean unused imports.
* added some improvements after testing
added some improvements after testing
2017-12-03 17:59:36 +01:00
Leomixer17
faa24bbdf4
Update italian.yml
2017-11-04 21:36:03 +01:00
c7w
f7793f027c
Update s_chinese.yml
2016-12-25 14:30:32 +08:00
Jesse Boyd
6bf2fbcfcf
Command tweaks
2016-09-26 18:33:27 +10:00
Jesse Boyd
12f8861d07
Various
...
externalize strings
plotme conversion fixes
2016-09-26 18:31:08 +10:00
Matt
b69e31129d
Updated Gradle
2016-02-22 23:11:40 -05:00