Commit Graph

5364 Commits

Author SHA1 Message Date
N0tMyFaultOG
e9efa3f2d3 Fix some translation issues 2020-08-16 18:24:54 +02:00
dordsor21
665a72a08f
Fill out a lot more JavaDoc.
I've left DB stuff alone
2020-08-16 13:22:49 +01:00
MeFisto94
61d1dcc231 Ignore Events if they are not caused by real players (i.e. citizens) 2020-08-16 14:09:32 +02:00
MeFisto94
6c9b73b100 Apply patch by @SirYwell to construct the ResourceKey without consulting the DimensionManager 2020-08-16 14:02:03 +02:00
Alexander Söderberg
a4c9ed90b7
Fix startup issues and make messages send properly 2020-08-16 13:49:16 +02:00
Alexander Söderberg
28d6d4db92
Fix shading mess and make the plugin start 2020-08-16 12:44:10 +02:00
dordsor21
12def37194
clean up some javadoc stuff 2020-08-16 11:34:08 +01:00
Alexander Söderberg
ed2302e545
Remove illegal import 2020-08-16 12:10:19 +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
300abd868a
Merge pull request #2888 from IntellectualSites/fix-conversion
Fix problem with config creation
2020-08-14 18:36:57 +02:00
Alexander Söderberg
87f0b1fc97
Add service system and rewrite Auto to use the service system 2020-08-14 17:24:34 +02:00
NotMyFault
78a6e72fe1
5.13.2 2020-08-14 15:26:32 +02:00
dordsor21
8f1b2a9d2a
fix pve against animals on other plots and roads 2020-08-14 14:21:45 +01:00
NotMyFault
5b27b652e7
Fix color tag 2020-08-14 12:52:00 +02:00
NotMyFault
556ff0baf4
Fix line break 2020-08-14 12:27:38 +02:00
NotMyFault
8cc536b20f
Fix spelling 2020-08-14 11:57:37 +02:00
N0tMyFaultOG
5e20c871a5 Fix metrics setting 2020-08-14 11:36:17 +02:00
NotMyFault
56fb892818
Fix brackets 2020-08-14 00:37:06 +02:00
N0tMyFaultOG
7f104c249a Permission cleanup
- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command

I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.
2020-08-13 23:32:13 +02:00
N0tMyFaultOG
0eeface374 Remove old translations 2020-08-13 21:37:28 +02:00
N0tMyFaultOG
ffe1e1e40d Core is Core 2020-08-13 21:25:17 +02:00
N0tMyFaultOG
5efdef19cf Remove dead asset setting 2020-08-13 21:16:30 +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
NotMyFault
808bddbfbb
Apply scaling to image 2020-08-12 10:30:05 +02:00
N0tMyFaultOG
d6dfa9a0b9 https 2020-08-11 20:12:31 +02:00
NotMyFault
924b73f070
Merge pull request #2896 from luca-gg/patch-1
Update de-DE.yml
2020-08-11 19:33:41 +02:00
Luca
64181c6ab8
Update de-DE.yml
adjusted grammar
2020-08-11 19:29:40 +02:00
N0tMyFaultOG
a1b10a2900 Remove dead files 2020-08-11 17:49:04 +02:00
N0tMyFaultOG
6315b9ea52 gradle 6.6 2020-08-11 17:43:24 +02:00
N0tMyFaultOG
7c756304b5 1.16.2 support
- Bump EssentialsX version to the latest release
2020-08-11 16:20:33 +02:00
NotMyFault
9fd11fbe13
Merge pull request #2893 from JunTVDE/de-translation-edit
added german translation for flag-descriptions to de-DE.yml
2020-08-09 13:21:31 +02:00
NotMyFault
7cd9a03b0f
Merge pull request #2894 from TimonMi/patch-1
Update link for contributing
2020-08-09 13:20:17 +02:00
EinDev
f8bd844c6c
Update link for contributing 2020-08-09 13:18:35 +02:00
JunTVDE
987d9a267c added german translation for flag-descriptions to de-DE.yml 2020-08-09 13:05:40 +02:00
EinDev
98d1bb9264 Merge remote-tracking branch 'upstream/v5' into v5 2020-08-08 18:39:47 +02:00
EinDev
b46a19f5ca Keep player names, so they don't have to be looked up again.
That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread.
As the player enters the Name, we don't have to look it up again.

Fixes PS-96
2020-08-08 18:07:49 +02:00
dordsor21
6e16ef1246
remove PllayerEvents 2020-08-08 13:21:46 +01: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
dordsor21
74a5c48214
Finish up core and bukkit json 2020-08-08 12:16:48 +01:00
N0tMyFaultOG
11af906c79 Fix a little oopsie 2020-08-07 18:55:22 +02: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
6012705e95
Implement Permission#format to replace the CaptionUtility#format method 2020-08-07 12:12:16 +01:00
dordsor21
21a97863ac
Refactor Captions to Permission, reimplement message list in debug command 2020-08-07 11:53:32 +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
Timon
dc3f45acd4 Added UseFlag check at Roads 2020-08-07 09:57:02 +01:00
Hannes Greule
6970dfa5f8 More json progress 2020-08-07 02:53:05 +02:00