dordsor21
914429ab4f
Merge branch 'v6' into features/v6/queue-features
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-10-09 15:23:09 +01:00
N0tMyFaultOG
e46b38b301
Fix plot set values
2020-10-08 19:51:42 +02:00
N0tMyFaultOG
841eef6a52
Fix done message on backup and add done message to grant
2020-10-08 18:57:11 +02:00
Hannes Greule
4e835ed3ff
Add missing command description
2020-09-20 00:51:54 +02:00
dordsor21
f0e9a8c5fe
Implement progress subscribers
2020-09-11 12:59:40 +01:00
N0tMyFaultOG
e924a1920e
Add message to rgar
2020-09-01 00:02:56 +02:00
Hannes Greule
55211907f2
Use command descriptions from translations
2020-08-20 23:16:15 +02:00
NotMyFault
d91357a807
Update messages_en.json
2020-08-18 10:59:44 +02:00
N0tMyFaultOG
3c8d7a808b
Prefix changes and others
2020-08-17 23:21:18 +02:00
N0tMyFaultOG
d6a80c7ea5
More json stuff, fixes and enhancements
2020-08-17 22:26:01 +02:00
N0tMyFaultOG
fabb9b6fd7
More json stuff
2020-08-17 18:15:29 +02:00
N0tMyFaultOG
c6a368d6f2
More json fixes
2020-08-17 13:24:15 +02:00
N0tMyFaultOG
f9d7d2d1dd
Fix clickable messages
2020-08-16 19:43:27 +02:00
N0tMyFaultOG
e9efa3f2d3
Fix some translation issues
2020-08-16 18:24:54 +02:00
Alexander Söderberg
a4c9ed90b7
Fix startup issues and make messages send properly
2020-08-16 13:49:16 +02:00
N0tMyFaultOG
618adb913d
Update license and remove dead module entries
2020-08-15 19:17:29 +02:00
N0tMyFaultOG
4a220f9bfb
Update license header
2020-08-15 14:59:29 +02:00
NotMyFault
5b27b652e7
Fix color tag
2020-08-14 12:52:00 +02:00
NotMyFault
56fb892818
Fix brackets
2020-08-14 00:37:06 +02:00
N0tMyFaultOG
0eeface374
Remove old translations
2020-08-13 21:37:28 +02:00
N0tMyFaultOG
c9fae6a070
Remove old translation setup and move commands to templates
2020-08-13 21:11:07 +02:00
N0tMyFaultOG
2b17f730d4
Merge v5 into v6
2020-08-12 18:20:37 +02:00
Luca
64181c6ab8
Update de-DE.yml
...
adjusted grammar
2020-08-11 19:29:40 +02:00
JunTVDE
987d9a267c
added german translation for flag-descriptions to de-DE.yml
2020-08-09 13:05:40 +02:00
dordsor21
7bad242944
Merge branch 'v6' into feature/v6/json. It builds!
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Clear.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
# Core/src/main/java/com/plotsquared/core/command/Relight.java
# Core/src/main/java/com/plotsquared/core/command/Set.java
# Core/src/main/java/com/plotsquared/core/command/Template.java
# Core/src/main/java/com/plotsquared/core/command/Trim.java
# Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
# Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
# Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
# Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
2020-08-08 13:20:30 +01:00
N0tMyFaultOG
c31c4b4286
More work
2020-08-07 18:52:45 +02:00
dordsor21
7f29b5d1e8
ComponentPreset inventory to json
2020-08-07 13:22:10 +01:00
dordsor21
50cfecb3fd
Several minor progress. Couple of bigger (inboxes and help)
2020-08-07 11:08:03 +01:00
dordsor21
1461804039
Remove last reference to PlotMessage in Core
2020-08-07 10:20:11 +01:00
Hannes Greule
6970dfa5f8
More json progress
2020-08-07 02:53:05 +02:00
dordsor21
18f630ba15
Bit more json
2020-08-06 14:06:19 +01:00
dordsor21
f68eb9c778
update plot list
2020-08-06 13:36:15 +01:00
dordsor21
4a960d9f2c
update pagination to new json
2020-08-06 12:23:47 +01:00
dordsor21
f1e3902fea
Several more progress
2020-08-05 11:48:10 +01:00
N0tMyFaultOG
41a623a643
More work towards json
2020-08-04 19:01:25 +02:00
dordsor21
d3fe1d3b2b
Fix plot info, sign usage in Plot.class
2020-08-04 15:07:07 +01:00
N0tMyFaultOG
01e66f8833
Readd skyblock template
2020-07-29 14:53:09 +02:00
N0tMyFaultOG
22a007b514
Revert "Update zh-CN.yml"
...
This reverts commit 240362a16d
2020-07-28 12:33:04 +02:00
NotMyFault
240362a16d
Update zh-CN.yml
2020-07-26 17:08:58 +02:00
N0tMyFaultOG
603d1ee9bb
Even more
...
Ok seriously, I stop here
2020-07-22 20:38:46 +02:00
N0tMyFaultOG
32e095ce15
More progress
...
I need a break, if something is missing, feel free to exchange that. K thx 🙏
2020-07-22 19:42:22 +02:00
N0tMyFaultOG
8d04728ebc
More work
2020-07-22 00:08:51 +02:00
N0tMyFaultOG
2aa5c276c9
Some more work done towards json
2020-07-21 21:39:52 +02:00
Alexander Söderberg
ed3eedd238
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Buy.java
# Core/src/main/java/com/plotsquared/core/command/Template.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java
# Core/src/main/java/com/plotsquared/core/plot/PlotId.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/PlayerManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
# Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java
2020-07-19 14:32:31 +02:00
Hannes Greule
7e0cdb12d7
Replace some common messages
2020-07-18 15:06:51 +02:00
Alexander Söderberg
e80ade65c7
Clean up PlotId
2020-07-18 11:05:16 +02:00
Alexander Söderberg
5478e70576
Fix some more captions
2020-07-17 21:46:15 +02:00
Alexander Söderberg
22bd2eb238
Super minor issues from previous merges
2020-07-17 18:06:38 +02:00
Alexander Söderberg
99be181aea
Migrate some more captions
2020-07-14 16:31:58 +02:00
N0tMyFaultOG
f93714a44e
Properly add prefixes to messages
2020-07-13 13:01:13 +02:00
Hannes Greule
564efd77f7
Fix some messages
2020-07-12 22:11:23 +02:00
N0tMyFaultOG
1881cdc9ab
Revert "Add prefix"
...
This reverts commit fb2aa44f78
2020-07-12 21:28:38 +02:00
N0tMyFaultOG
fb2aa44f78
Add prefix
2020-07-12 21:25:22 +02:00
Hannes Greule
6bf5bc60d1
Update messages_en.json with new placeholders
2020-07-04 18:57:56 +02:00
N0tMyFaultOG
600f757046
Finish messages
2020-06-29 12:34:09 +02:00
N0tMyFaultOG
a2aaa3633a
More work
2020-06-28 16:56:42 +02:00
N0tMyFaultOG
3b793929d8
Initialize messages_en.json
2020-06-28 13:51:57 +02:00
Aurélien
be6910d5d9
Reformated and update French translation
...
Some of my translations used '' to represent ' but it's not needed. Also splited some long lines and translated new backup system and keep-inventory flag.
2020-05-12 17:29:32 +02:00
NotMyFault
b136f44f12
Merge branch 'v5' into remove-eol-translation-strings
2020-05-10 15:05:58 +02:00
Aurélien
503fc44208
Updated according to new translations and old removed
2020-05-10 14:12:56 +02:00
Aurélien
d3bfaeb5a4
Ready for merging !
...
Removed useless space at the end of the file + precision of the date (latest edition)
2020-05-10 14:12:56 +02:00
Aurélien
7adecd0808
Last fix (removed unused translation + added the missing)
2020-05-10 14:12:56 +02:00
Aurélien
c99e081ae0
Fiexed issues reported by CodeFactor
2020-05-10 14:12:56 +02:00
Aurélien
285b6bf62d
Updated and corrected French translation
...
Old translation has been reviewed and new v5 flags' translations has been added.
Some mistakes could now remain, I will fix them if needed ;)
Enjoy !
2020-05-10 14:12:56 +02:00
N0tMyFaultOG
198c7ca58d
Remove dead translations
2020-05-09 14:04:08 +02:00
N0tMyFaultOG
4780fcd534
Fixes #2782
...
Thanks for the contribution :)
2020-04-21 15:53:38 +02:00
Alexander Söderberg
6f052f0001
Remove extra line from HEADER
2020-04-16 05:05:58 +02:00
Alexander Söderberg
ba40a56c32
Add GPLv3 License headers to all source files.
2020-04-16 04:52:39 +02:00
NotMyFault
24b6b23d25
Bind update notifications to spigot resource updates
...
The notification permission could be moved back into the other class, but well
2020-02-16 01:33:43 +01:00
NotMyFault
118adb42b9
add hungarian translation
2020-01-14 12:27:23 +01:00
NotMyFault
05ef076ef0
Remove unnecessary spaces
2019-09-12 04:01:47 +02:00
NotMyFault
d20d95d29b
Remove schematic test command
2019-09-12 03:53:29 +02:00
NotMyFault
bb97fb8e19
Update Templates to sponge schematic format
...
Skyblock has been removed as it was simply the default island if ASkyBlock
2019-08-13 04:08:17 +02:00
NotMyFault
f1c190028e
Fixes #2013
...
Tested with LuckPerms, result successful.
2019-08-12 23:59:14 +02:00
Leomixer17
520be48198
Create fixborders.js
2019-08-05 14:47:19 -04:00
Leomixer17
e4a345880e
Update addsigns.js
2019-08-05 14:46:54 -04:00
dordsor21
bef3dbc6f4
Reformat code
2019-04-23 23:48:22 +01:00
Jesse Boyd
6916752434
Fixes #2322
2019-04-12 12:11:03 +10:00
Sauilitired
0b77b863ba
Update notifications.
2019-03-18 19:49:22 +01:00
dordsor21
51afbdfcdc
Apply correct codestyle
2019-02-04 13:59:11 +00:00
NotMyFault
cd8a1a0816
Fixed some translation mismatches
2019-01-27 00:48:03 +01:00
dordsor21
d81d3c72e4
Update scripts and code to work nicely with each other.
...
Fixes #2208
2019-01-12 19:56:11 +00:00
NotMyFault
c5f1c60ad7
Delete base.yml
2019-01-10 22:16:22 +01:00
dordsor21
77ddeabca2
Fix NPE with plot version (update to new versioning within code)
...
Also add date and commit to plugin.properties file.
2019-01-03 17:32:21 +00:00
dordsor21
cbc2b70336
Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking
...
# Conflicts:
# README.md
2018-12-20 00:55:44 +00:00
NotMyFault
8ad75efa0e
Adding French translation
2018-12-12 16:12:40 +01:00
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
