EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity
4,007 Commits 231 Branches 71 Tags 86 MiB
b648717079
Commit Graph

4007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NotMyFault
acf9c2554f
Merge pull request #2904 from IntellectualSites/dependabot/gradle/v5/org.ajoberstar.grgit-4.0.2 
Bump org.ajoberstar.grgit from 4.0.1 to 4.0.2
 2020-09-02 16:12:56 +02:00
dependabot[bot]
7c53bfc870
Bump snakeyaml from 1.25 to 1.26 
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
32a8dcd411
Bump annotations from 20.0.0 to 20.1.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
20b4cec0ca
Bump org.ajoberstar.grgit from 4.0.1 to 4.0.2 
Bumps org.ajoberstar.grgit from 4.0.1 to 4.0.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:39 +00:00
NotMyFault
c51c938e8d
Merge pull request #2903 from IntellectualSites/dependabot/add-v2-config-file 
Create Dependabot config file
 2020-09-02 16:10:14 +02:00
dependabot-preview[bot]
49984f2560
Create Dependabot config file 2020-09-02 13:55:15 +00:00
N0tMyFaultOG
b3c77ef099 Merge branch 'dependabot/gradle/v5/org.jetbrains.kotlin-kotlin-stdlib-1.4.0' into v5 2020-09-02 12:57:05 +02:00
N0tMyFaultOG
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
NotMyFault
1441cc293c
5.13.3 2020-08-26 13:57:20 +02:00
Hannes Greule
c42d5390a4 Allow teleporting to merged plots with multiple owners using /p home 2020-08-24 13:37:12 +02:00
Hannes Greule
c53cffb745 Generate signs by default 2020-08-24 13:17:15 +02:00
dependabot-preview[bot]
acb0bd95f2
Bump kotlin-stdlib from 1.3.72 to 1.4.0 
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.72 to 1.4.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.0/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.72...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-22 23:05:56 +00:00
NotMyFault
5d73b17415
Merge pull request #2899 from IntellectualSites/dependabot/gradle/v5/org.jetbrains-annotations-20.0.0 
Bump annotations from 19.0.0 to 20.0.0
 2020-08-23 01:04:40 +02:00
N0tMyFaultOG
3a8fa9f5b6 Update WorldEdit version 
That doesn't appear to break stuff 👀
 2020-08-22 13:18:00 +02:00
N0tMyFaultOG
e93d7feb2c Fixes PS-114 2020-08-22 11:48:03 +02:00
N0tMyFaultOG
5c08db2f44 Merge branch 'feature/v5/1.16.2-support' into v5 2020-08-21 19:02:23 +02:00
NotMyFault
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
NotMyFault
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
Hannes Greule
1064d777c2 Clean up unused code 2020-08-21 00:02:07 +02:00
Hannes Greule
62f675adbe Allow visiting all owners of merged plots 2020-08-21 00:01:53 +02:00
dependabot-preview[bot]
869a579655
Bump annotations from 19.0.0 to 20.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 19.0.0 to 20.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-17 09:08:30 +00: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
NotMyFault
300abd868a
Merge pull request #2888 from IntellectualSites/fix-conversion 
Fix problem with config creation
 2020-08-14 18:36:57 +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
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
Timon
dc3f45acd4 Added UseFlag check at Roads 2020-08-07 09:57:02 +01:00
MeFisto94
48d3c2105d Fixes an OfflinePlayerUtil breakage caused by NMS Changes 2020-08-06 15:23:36 +02:00
Timon
c745b99922 Added UseFlag check at Roads 2020-08-06 12:01:43 +02:00
N0tMyFaultOG
01d2b0024f Add more information to the debugpaste 2020-07-31 20:33:17 +02:00
N0tMyFaultOG
01e66f8833 Readd skyblock template 2020-07-29 14:53:09 +02:00
dordsor21
afd9b56e71
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 2020-07-28 13:58:37 +01:00
dordsor21
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
N0tMyFaultOG
22a007b514 Revert "Update zh-CN.yml" 
This reverts commit 240362a16d.
 2020-07-28 12:33:04 +02:00
N0tMyFaultOG
ab121c7eee Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133 2020-07-26 21:12:32 +02:00
NotMyFault
240362a16d
Update zh-CN.yml 2020-07-26 17:08:58 +02:00
Alexander Söderberg
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