Commit Graph

3941 Commits

Author SHA1 Message Date
5c08db2f44 Merge branch 'feature/v5/1.16.2-support' into v5 2020-08-21 19:02:23 +02:00
28fc29c3ab Merge pull request #2890 from MeFisto94/fix-1-16-worldserver-regression
Fixes an OfflinePlayerUtil breakaged caused by NMS Changes
2020-08-21 18:29:03 +02:00
b2ac67692e Merge pull request #2892 from TimonMi/v5
[Bugfix] No chat message confirmation on /p add /p trust, etc.
2020-08-21 18:28:05 +02:00
1064d777c2 Clean up unused code 2020-08-21 00:02:07 +02:00
62f675adbe Allow visiting all owners of merged plots 2020-08-21 00:01:53 +02:00
61d1dcc231 Ignore Events if they are not caused by real players (i.e. citizens) 2020-08-16 14:09:32 +02:00
6c9b73b100 Apply patch by @SirYwell to construct the ResourceKey without consulting the DimensionManager 2020-08-16 14:02:03 +02:00
300abd868a Merge pull request #2888 from IntellectualSites/fix-conversion
Fix problem with config creation
2020-08-14 18:36:57 +02:00
78a6e72fe1 5.13.2 2020-08-14 15:26:32 +02:00
8f1b2a9d2a fix pve against animals on other plots and roads 2020-08-14 14:21:45 +01:00
808bddbfbb Apply scaling to image 2020-08-12 10:30:05 +02:00
d6dfa9a0b9 https 2020-08-11 20:12:31 +02:00
924b73f070 Merge pull request #2896 from luca-gg/patch-1
Update de-DE.yml
2020-08-11 19:33:41 +02:00
64181c6ab8 Update de-DE.yml
adjusted grammar
2020-08-11 19:29:40 +02:00
a1b10a2900 Remove dead files 2020-08-11 17:49:04 +02:00
6315b9ea52 gradle 6.6 2020-08-11 17:43:24 +02:00
7c756304b5 1.16.2 support
- Bump EssentialsX version to the latest release
2020-08-11 16:20:33 +02:00
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
7cd9a03b0f Merge pull request #2894 from TimonMi/patch-1
Update link for contributing
2020-08-09 13:20:17 +02:00
f8bd844c6c Update link for contributing 2020-08-09 13:18:35 +02:00
987d9a267c added german translation for flag-descriptions to de-DE.yml 2020-08-09 13:05:40 +02:00
98d1bb9264 Merge remote-tracking branch 'upstream/v5' into v5 2020-08-08 18:39:47 +02:00
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
dc3f45acd4 Added UseFlag check at Roads 2020-08-07 09:57:02 +01:00
48d3c2105d Fixes an OfflinePlayerUtil breakage caused by NMS Changes 2020-08-06 15:23:36 +02:00
c745b99922 Added UseFlag check at Roads 2020-08-06 12:01:43 +02:00
01d2b0024f Add more information to the debugpaste 2020-07-31 20:33:17 +02:00
01e66f8833 Readd skyblock template 2020-07-29 14:53:09 +02:00
afd9b56e71 Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 2020-07-28 13:58:37 +01:00
e2f9b4245b Fixes https://issues.intellectualsites.com/issue/PS-81
- Add break statements to switches to prevent bleed from normal spawning to breeding
 - Separate misc spawning from mob spawning
2020-07-28 13:56:37 +01:00
22a007b514 Revert "Update zh-CN.yml"
This reverts commit 240362a16d.
2020-07-28 12:33:04 +02:00
ab121c7eee Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133 2020-07-26 21:12:32 +02:00
240362a16d Update zh-CN.yml 2020-07-26 17:08:58 +02:00
f2dcbce490 Fix problem where servers created in v5 (not converted from v4) would fail to start properly.
This is a quite major issue and I hope this fix resolves it. Although, it should be tested with migration from v4 to v5 and then a fresh v5 server.
2020-07-25 03:16:36 +02:00
88df434404 Create CODE_OF_CONDUCT.md 2020-07-25 03:11:07 +02:00
73e3572c72 Fix the redstone flag on roads 2020-07-21 13:11:28 +02:00
87a8ff742f 5.13.1 2020-07-19 14:16:13 +02:00
57435fdf34 verbosely ensure items cannot be duplicated when keeping inventory on death
Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15
2020-07-16 23:24:11 +01:00
01ff9a34c2 Merge branch 'features/v5/placeholders' into v5 2020-07-16 18:48:45 +02:00
ff3a94933a Bump version 2020-07-16 18:43:52 +02:00
97a356c4a0 Very attentive reviewers, can recommend 2020-07-16 18:13:02 +02:00
10ab28c1ec Add missing license headers 2020-07-16 18:08:00 +02:00
2d9cf8b759 Get placeholders working 2020-07-16 18:04:17 +02:00
32b28a4ca5 Turn all UUID messages into debug messages 2020-07-15 22:42:58 +02:00
4996d8bcd1 Remove left over debugs 2020-07-15 14:05:15 +02:00
e5963a8590 Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners
Clean up bukkit listeners by splitting them up
2020-07-15 13:35:38 +02:00
e8c155763b Register placeholders 2020-07-15 12:44:07 +02:00
a52249513e Update MVdW version 2020-07-15 12:05:42 +02:00
5d2d4ac12b fix language issue 2020-07-14 20:47:15 +02:00
64f5580edd Fix code styling issue 2020-07-14 20:46:52 +02:00