Commit Graph

4528 Commits

Author SHA1 Message Date
fafdae9ba9 Only check ice-form for ice (#2940)
Co-authored-by: NotMyFault <mc.cache@web.de>
2020-12-28 14:11:30 +00:00
ef215b1b0c fix debugpaste with multiverse 2020-12-28 12:31:51 +00:00
1d0721034d fix debugpaste with multiverse 2020-12-28 12:30:53 +00:00
3cfbe9585a Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2020-12-28 12:27:12 +00:00
71305e636c cache bukkitworld 2020-12-28 12:10:27 +00:00
ce23c153ee Fix added_list and denied_list placeholders 2020-12-28 12:15:34 +01:00
019da4d2f4 Expose legacy serializer for placeholders 2020-12-28 11:21:35 +01:00
ffc31f565b Use builder for flags component 2020-12-28 00:05:33 +01:00
7f01f2d716 Rename placeholders matching more appropriately 2020-12-27 19:37:09 +01:00
bf20b0dd79 Beautify placeholder output for '*' permission 2020-12-27 19:16:26 +01:00
867826759b Make placeholders translatable 2020-12-26 13:50:00 +01:00
3be370071c fix purge <owner> 2020-12-23 14:13:50 +00:00
2b9a194244 5.13.10 2020-12-23 14:07:42 +00:00
67a928b1ae Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 2020-12-23 13:54:35 +00:00
67a7211b77 use correct UUID pipeline methods in purge command 2020-12-23 13:52:47 +00:00
1d4fe01db0 Rename database chart id 2020-12-22 20:54:22 +01:00
07491d8028 Rename database chart id 2020-12-22 20:53:13 +01:00
7f1baca872 Add database type to debugpaste 2020-12-22 17:55:37 +01:00
8c3a0a8275 Fix compiling 2020-12-21 20:33:49 +01:00
eba6043d26 Update paster 2020-12-21 15:59:12 +01:00
397692d113 Update Paster 2020-12-21 15:58:34 +01:00
035ecc1517 Delete dependabot.yml 2020-12-21 10:58:30 +01:00
bb52301200 Merge remote-tracking branch 'origin/renovate/configure' into v6 2020-12-20 22:38:35 +01:00
f4adf5d7e7 Add renovate.json 2020-12-20 21:24:38 +00:00
e4a8459798 Switch to IncendoPaster "library" 2020-12-19 16:20:44 +00:00
14fa738fbe switch to InvendoPaster "library" 2020-12-19 16:00:13 +00:00
4da7aa38ea @Sauilitired can't spell properly 2020-12-16 13:23:14 +01:00
5147d67318 Add charts for complex plot components 2020-12-16 13:20:23 +01:00
cbc599cb20 don't double-up schematic x/z offsets 2020-12-16 12:13:39 +00:00
09c84e25bf don't double-up schematic x/z offsets 2020-12-16 12:07:36 +00:00
224e3b6ad4 Fix publishing. I am an author. 2020-12-14 18:09:09 +00:00
992a683ba2 another annoying cache thing 2020-12-14 15:22:10 +00:00
e8e116312a Merge branch 'v5' into v6
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Deny.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-12-14 15:15:27 +00:00
de3ba9a25c re-send block change for blocks with gravity if they're physicsed
fixes PS-159
2020-12-14 14:53:53 +00:00
5e88cabb4b compare UUID to UUID, not UUIDMapping
fix PS-182
2020-12-14 14:32:34 +00:00
6d71177394 Don't save corrupt schematics so that when they load, they work. 2020-12-13 21:09:05 +00:00
edd9ae5118 Fix more flag message issues. 2020-12-12 22:46:37 +01:00
23ae3b5830 Use builder for flag list message 2020-12-12 21:19:28 +01:00
6746aab7ef Improve /plot info formatting 2020-12-12 18:56:19 +01:00
c85ff7ddda Update README.md 2020-12-12 17:52:24 +01:00
cf70efabb0 we want throwable to be null 2020-12-11 16:51:13 +00:00
6eb2958afc Fix merge issue 2020-12-11 11:42:19 +00:00
18f13b7d15 Merge branch 'v5' into v6 2020-12-10 21:28:28 +00:00
0bb959d26a Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2020-12-10 21:15:51 +00:00
b4f3e85001 allow "owned" road mobs to be killed as well
(those that are leashed, being ridden, etc)
2020-12-10 21:14:32 +00:00
25100c46f7 Don't unclaim claimed plots with /p claim 2020-12-10 22:13:13 +01:00
540f4c0958 fix info for server-plots 2020-12-10 21:05:50 +00:00
8930ebe572 Relight command is pointless as we'd just use FAWE for it anyway. 2020-12-10 18:06:32 +00:00
8f93f2b6d2 Revert "Allow "Server" owner" as that has its own UUID
This reverts commit 9ba91889e0.
2020-12-10 18:02:38 +00:00
9ba91889e0 Allow "Server" owner 2020-12-10 17:58:00 +00:00