Commit Graph

1529 Commits

Author SHA1 Message Date
N0tMyFaultOG
841eef6a52 Fix done message on backup and add done message to grant 2020-10-08 18:57:11 +02:00
Mariell Hoversholm
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
N0tMyFaultOG
ec23fcdd75 Rewrite build scripts
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
2020-10-08 14:02:08 +02:00
dordsor21
544d57c720
Merge branch 'v5' into v6
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	build.gradle
2020-10-07 12:20:32 +01:00
N0tMyFaultOG
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
Aurora
e6237d68d0 Also remove BungeePerms from the config 2020-10-04 13:26:56 +02:00
dordsor21
95f509d337
Stop forcing loiwercase world names 2020-10-02 15:08:14 +01:00
dordsor21
ff83931a3f
Fix plot grant 2020-09-20 19:42:13 +01:00
Hannes Greule
4e835ed3ff Add missing command description 2020-09-20 00:51:54 +02:00
dordsor21
41f494fbff
Remove jetbrains annotations 2020-09-18 12:45:26 +01:00
dordsor21
554efbb057
Merge branch 'v5' into v6
# Conflicts:
#	.github/CODEOWNERS
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Alias.java
#	Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
#	Core/src/main/java/com/plotsquared/core/command/Music.java
#	Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
#	build.gradle
2020-09-11 15:44:04 +01:00
dordsor21
d843d1715d
Allow /plot home [area|world] 2020-09-11 15:03:48 +01:00
NotMyFault
5463f15633
Add pigstep music disc 2020-09-11 01:16:57 +02:00
Hannes Greule
f2355a76d6 Add default namespace when wrapping block categories by their ids 2020-09-06 23:36:36 +02:00
Alexander Söderberg
0aeca40137
Take player visibility into account when sending notify-enter and notify-leave messages. Fixes PS-103. 2020-09-05 18:48:58 +02:00
Hannes Greule
babad3ab6d Don't validate plot aliases with offline players (Fixes PS-126) 2020-09-04 14:49:02 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
N0tMyFaultOG
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
N0tMyFaultOG
e924a1920e Add message to rgar 2020-09-01 00:02:56 +02:00
Hannes Greule
311a2ddc75 Replace null checks with NullEconHandler 2020-08-25 12:41:03 +02:00
Hannes Greule
551d1d9f1a Add NullEconHandler to avoid verbose null checks 2020-08-25 12:41:03 +02:00
N0tMyFaultOG
a5dea9e7f6 Permission cleanup 2020-08-24 20:51:23 +02:00
N0tMyFaultOG
02bd83bd90 Merge v5 into v6 2020-08-24 14:33:53 +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
31ea7297c2 Generate signs by default 2020-08-24 13:30:50 +02:00
Hannes Greule
c53cffb745 Generate signs by default 2020-08-24 13:17:15 +02:00
N0tMyFaultOG
26a99a122a Minor permission fix 2020-08-23 19:34:22 +02:00
N0tMyFaultOG
e93d7feb2c Fixes PS-114 2020-08-22 11:48:03 +02:00
N0tMyFaultOG
116b870152 Apply missing license header 2020-08-22 11:44:34 +02:00
Alexander Söderberg
45e75cc06e
Merge branch 'v6' into features/v6/services 2020-08-21 23:02:52 +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
Hannes Greule
cee0bbb805 Revert target usage 2020-08-20 23:29:51 +02:00
Hannes Greule
77eb75fcc6 Adapt adventure changes 2020-08-20 23:28:42 +02:00
Hannes Greule
55211907f2 Use command descriptions from translations 2020-08-20 23:16:15 +02:00
Alexander Söderberg
e1e7cd1479
Add missing license headers 2020-08-20 17:11:12 +02:00
Alexander Söderberg
2d3c729215
Extract plot modifications to external class 2020-08-20 17:10:50 +02:00
Alexander Söderberg
f391cfd432
Extract comment logic from the plot class 2020-08-20 16:03:06 +02:00
N0tMyFaultOG
352136f0c6 Cleanup logging system 2020-08-18 15:50:28 +02:00
N0tMyFaultOG
b6e7f90f6a Fix logger.info format 2020-08-18 15:34:43 +02:00
N0tMyFaultOG
86cfeb76b6 More json stuff 2020-08-18 12:22:26 +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
05a15ac689 Fix a few typos and spaces 2020-08-17 19:39:43 +02:00
N0tMyFaultOG
580cc359e5 fabb9b6fd7 (r41530745) 2020-08-17 18:56:27 +02:00
N0tMyFaultOG
630284e7ae More json fixes 2020-08-17 18:42:42 +02:00
N0tMyFaultOG
cc562033e7 Fix console requirement 2020-08-17 18:29:51 +02:00