EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-26 07:03:45 +01:00
Code Issues Projects Releases Wiki Activity
5,607 Commits 281 Branches 82 Tags
55e9d176109780c4a2b773c52b24d2f1f557b756
Commit Graph

5607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Söderberg
d20fa39cf5 Add flag that prevents people from copying NBT data in the plot unless they're added as members 2020-05-12 19:25:06 +02:00
Aurélien
be6910d5d9 Reformated and update French translation 
Some of my translations used '' to represent ' but it's not needed. Also splited some long lines and translated new backup system and keep-inventory flag.
 2020-05-12 17:29:32 +02:00
Hannes Greule
2d6a5a3804 Update download link 2020-05-12 15:16:51 +02:00
NotMyFault
630e81fbfb 5.11.1 2020-05-12 13:42:24 +02:00
Alexander Söderberg
6488aafd9d Version bump 2020-05-12 12:56:18 +02:00
Alexander Söderberg
4ad90d423d Fix timeout comment 2020-05-12 12:52:45 +02:00
Alexander Söderberg
d2dae45082 Add leaves to the blacklist 2020-05-12 12:49:39 +02:00
Alexander Söderberg
85c9bd7ceb Add all sign type to blacklist 2020-05-12 12:24:36 +02:00
dordsor21
d0ee579069 Move backup config section to a more appropriate place 2020-05-12 10:44:34 +01:00
Alexander Söderberg
10dbcbcdbd Prevent NPE in entityDamage 
This is done by creating a fake (WE) entity type in the case that the entity type name is null. In these cases, WE has no equivalent.

By doing this, all entity category contains check will fail, and it will default to the PVE check at the bottom of the if-else if chain.
 2020-05-12 10:05:47 +02:00
Alexander Söderberg
e8dd5fe903 Merge pull request #2816 from IntellectualSites/backups 
Plot backup system
 2020-05-12 09:40:25 +02:00
Alexander Söderberg
32c23e6ced Merge branch 'v5' into backups 2020-05-11 22:27:16 +02:00
Alexander Söderberg
81aaba328a ENGLISH > ROOT 2020-05-11 22:21:37 +02:00
Alexander Söderberg
3c5dd3d0d2 Merge remote-tracking branch 'origin/v5' into v5 2020-05-11 22:11:29 +02:00
Alexander Söderberg
2dc07d9321 Add a looooot of default disallowed blocks 2020-05-11 22:11:21 +02:00
N0tMyFaultOG
841dd5e189 Update wiki links 2020-05-11 20:27:06 +02:00
Alexander Söderberg
b2bc2887d2 Fix dumdum merge 2020-05-11 20:17:41 +02:00
Alexander Söderberg
e20319f4e1 Merge branch 'v5' into backups 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/configuration/Captions.java
 2020-05-11 20:15:48 +02:00
Alexander Söderberg
d40160d205 Fix javadoc 2020-05-11 20:04:22 +02:00
Alexander Söderberg
f7167d5e83 Fix typo 2020-05-11 20:03:26 +02:00
Alexander Söderberg
282773a43f Replace Guava methods with stdlib equivalents 2020-05-11 20:02:33 +02:00
Alexander Söderberg
8944be5319 (Complex) command suggestions for /plot set 2020-05-11 19:37:25 +02:00
Alexander Söderberg
df01f9bea7 Add a list of blocks that cannot be used in /plot set <component> 2020-05-11 18:35:06 +02:00
Alexander Söderberg
3c17b76b1c Remove dum-dum line break 2020-05-11 11:21:32 +02:00
Alexander Söderberg
7a6909dab1 Merge branch 'v5' into backups 2020-05-11 11:19:59 +02:00
Alexander Söderberg
3064ae80d1 Add a keep-inventory flag 2020-05-11 11:19:36 +02:00
dordsor21
06bb6856a8 Fix bad getApplicablePlotArea(Location) code 
- Fixes #2815 alongside 667098268f
 2020-05-11 09:48:18 +01:00
Alexander Söderberg
702caa6feb Remove rogue line break 2020-05-10 22:09:56 +02:00
Alexander Söderberg
fc74c582bf Add option to disable deletion of plot backups when the plot is unclaimed 2020-05-10 21:52:57 +02:00
Alexander Söderberg
658361f825 Destroy backups when the plot is uncalimed 2020-05-10 21:31:16 +02:00
Alexander Söderberg
e0c9a802d8 Add automatic backups and implement them /plot clear and /plot set <component>. 2020-05-10 20:31:07 +02:00
Alexander Söderberg
c4a70c0945 Fix tab completion for the backup command 2020-05-10 19:42:42 +02:00
Alexander Söderberg
f7d6ac00e4 Make the backup commands work 2020-05-10 19:20:11 +02:00
Alexander Söderberg
8ed5a21b36 Merge branch 'v5' into backups 2020-05-10 17:03:36 +02:00
N0tMyFaultOG
773a993ee1 Merge branch 'remove-eol-translation-strings' into v5 2020-05-10 17:02:13 +02:00
Alexander Söderberg
6fb63c9609 Implement backup restoration command. This might work, idk, we'll see. 2020-05-10 16:53:19 +02:00
Alexander Söderberg
079289eb74 Use #getTranslated on GENERIC_UNOWNED 2020-05-10 16:40:12 +02:00
Alexander Söderberg
59f96d4455 Translate all backup failure reasons 2020-05-10 16:39:14 +02:00
Alexander Söderberg
cdab52fcbe dumdum space go bye bye 2020-05-10 16:04:33 +02:00
Alexander Söderberg
63c9037b10 Fix typo 2020-05-10 16:00:20 +02:00
Alexander Söderberg
bbc86eba39 /plot debug progress 2020-05-10 15:51:27 +02:00
Alexander Söderberg
e0fb6f5440 /plot debug structure 2020-05-10 15:36:20 +02:00
Alexander Söderberg
2bd30af361 Cache both backup profiles and backup objects 2020-05-10 15:12:17 +02:00
NotMyFault
b136f44f12 Merge branch 'v5' into remove-eol-translation-strings 2020-05-10 15:05:58 +02:00
Alexander Söderberg
d0dbb495b0 Add BackupProfile#restoreBackup 2020-05-10 14:58:45 +02:00
Alexander Söderberg
8715a27a93 No backups for merged plots 🐮 2020-05-10 14:41:02 +02:00
Aurélien
503fc44208 Updated according to new translations and old removed 2020-05-10 14:12:56 +02:00
Aurélien
d3bfaeb5a4 Ready for merging ! 
Removed useless space at the end of the file + precision of the date (latest edition)
 2020-05-10 14:12:56 +02:00
Aurélien
7adecd0808 Last fix (removed unused translation + added the missing) 2020-05-10 14:12:56 +02:00
Aurélien
c99e081ae0 Fiexed issues reported by CodeFactor 2020-05-10 14:12:56 +02:00