Commit Graph

2071 Commits

Author SHA1 Message Date
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
d843d1715d Allow /plot home [area|world] 2020-09-11 15:03:48 +01:00
1552a8e74b Add option to change lighting behaviour in queues 2020-09-11 14:18:50 +01:00
f0e9a8c5fe Implement progress subscribers 2020-09-11 12:59:40 +01:00
a98b23af02 progress subscriber 2020-09-11 11:20:38 +01:00
5463f15633 Add pigstep music disc 2020-09-11 01:16:57 +02:00
f2355a76d6 Add default namespace when wrapping block categories by their ids 2020-09-06 23:36:36 +02:00
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
babad3ab6d Don't validate plot aliases with offline players (Fixes PS-126) 2020-09-04 14:49:02 +02:00
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
e924a1920e Add message to rgar 2020-09-01 00:02:56 +02:00
311a2ddc75 Replace null checks with NullEconHandler 2020-08-25 12:41:03 +02:00
551d1d9f1a Add NullEconHandler to avoid verbose null checks 2020-08-25 12:41:03 +02:00
a5dea9e7f6 Permission cleanup 2020-08-24 20:51:23 +02:00
02bd83bd90 Merge v5 into v6 2020-08-24 14:33:53 +02:00
c42d5390a4 Allow teleporting to merged plots with multiple owners using /p home 2020-08-24 13:37:12 +02:00
31ea7297c2 Generate signs by default 2020-08-24 13:30:50 +02:00
c53cffb745 Generate signs by default 2020-08-24 13:17:15 +02:00
26a99a122a Minor permission fix 2020-08-23 19:34:22 +02:00
e93d7feb2c Fixes PS-114 2020-08-22 11:48:03 +02:00
116b870152 Apply missing license header 2020-08-22 11:44:34 +02:00
45e75cc06e Merge branch 'v6' into features/v6/services 2020-08-21 23:02:52 +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
cee0bbb805 Revert target usage 2020-08-20 23:29:51 +02:00
77eb75fcc6 Adapt adventure changes 2020-08-20 23:28:42 +02:00
55211907f2 Use command descriptions from translations 2020-08-20 23:16:15 +02:00
e1e7cd1479 Add missing license headers 2020-08-20 17:11:12 +02:00
2d3c729215 Extract plot modifications to external class 2020-08-20 17:10:50 +02:00
f391cfd432 Extract comment logic from the plot class 2020-08-20 16:03:06 +02:00
352136f0c6 Cleanup logging system 2020-08-18 15:50:28 +02:00
b6e7f90f6a Fix logger.info format 2020-08-18 15:34:43 +02:00
86cfeb76b6 More json stuff 2020-08-18 12:22:26 +02:00
d91357a807 Update messages_en.json 2020-08-18 10:59:44 +02:00
3c8d7a808b Prefix changes and others 2020-08-17 23:21:18 +02:00
d6a80c7ea5 More json stuff, fixes and enhancements 2020-08-17 22:26:01 +02:00
05a15ac689 Fix a few typos and spaces 2020-08-17 19:39:43 +02:00
580cc359e5 fabb9b6fd7 (r41530745) 2020-08-17 18:56:27 +02:00
630284e7ae More json fixes 2020-08-17 18:42:42 +02:00
cc562033e7 Fix console requirement 2020-08-17 18:29:51 +02:00
fabb9b6fd7 More json stuff 2020-08-17 18:15:29 +02:00
aacf15757f Use less confusing variable name 2020-08-17 15:32:17 +02:00
4789327378 Encapsulate fields 2020-08-17 15:17:40 +02:00
c6a368d6f2 More json fixes 2020-08-17 13:24:15 +02:00
7cd1e8ea76 Fix command registration 2020-08-17 04:39:59 +02:00
351ae1b2c7 Synchronize auto queries 2020-08-17 01:27:45 +02:00
457f3e25cc resolve rebase issue 2020-08-17 01:10:46 +02:00
41c670450b Remove PlotFilter 2020-08-17 01:10:46 +02:00