Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-08 09:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,237 Commits 14 Branches 68 Tags 88 MiB
fed5169724
Commit Graph

3237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Boyd
fed5169724
Get sign lines sync 2019-11-05 15:23:48 +00:00
MattBDev
46926a4d99 Merge remote-tracking branch 'origin/breaking' into breaking 2019-11-04 16:20:03 -05:00
NotMyFault
e8bf3f0d2c
Merge pull request #2558 from IntellectualSites/more-translation-strings 
Add translation messages for flag errors
 2019-11-04 21:12:39 +01:00
NotMyFault
a25511c849 Add custom translations for special flags 2019-11-04 19:22:54 +01:00
NotMyFault
315f26fb82 Add missing color 2019-11-04 00:46:08 +01:00
NotMyFault
e972cb4c1a Make flag error messages translatable 2019-11-04 00:33:04 +01:00
NotMyFault
7309e61221 AeSix' template improvements 2019-11-02 12:48:41 +01:00
MattBDev
17e784c283 Revert dependency upgrades 2019-11-01 21:45:06 -04:00
Matt
627ecd2b71
Merge pull request #2542 from mindw0rm/UntrustedVisit 
New plot flag untrusted-visit
 2019-10-31 17:02:48 -04:00
Matt
1c5bd55c96
Merge pull request #2553 from IntellectualSites/bukkit-api 
Providing bukkit module on maven
 2019-10-31 17:02:00 -04:00
NotMyFault
6ec3951e4e
Add Bukkit module to maven 2019-10-30 15:05:52 +01:00
Alexander Söderberg
d1115d62a7
Merge pull request #2548 from IntellectualSites/flag_fix 
Flag fixes and others 🐮
 2019-10-27 16:13:22 +01:00
NotMyFault
e29727827d Fix missing word 2019-10-27 16:02:34 +01:00
NotMyFault
1f89948948 Remove unused flags 2019-10-27 16:01:57 +01:00
NotMyFault
1067e5f2c2
Remove redundant empty line 2019-10-27 15:19:49 +01:00
NotMyFault
25ca011bfe
Fixes #2550 2019-10-27 15:10:15 +01:00
Alexander Söderberg
3be0be1b60 Make sure DENY_EXIT checks for the admin override permission. Fixes #2411. 2019-10-27 12:11:48 +01:00
Alexander Söderberg
2e15934666 Fix /plot flag set allowing for invalid flag values. (Fixes #2519) 2019-10-27 12:01:04 +01:00
Alexander Söderberg
cb52ee8cfb Make the flag list output message configurable. 2019-10-27 11:55:15 +01:00
Alexander Söderberg
01eee306f1 Fixes #2462 by making flag categories translatable. This reflects (somewhat) recent changes to command categories. 2019-10-27 11:45:18 +01:00
Alexander Söderberg
a601739fbd Improve handling of list flags, which in turn resolves issues where add and remove would allow players to add flags with unrecognized values. 2019-10-27 11:25:33 +01:00
mindw0rm
cb1767347b
Merge branch 'breaking' into UntrustedVisit 2019-10-23 20:51:59 +02:00
Matt
32654e1f25
Merge pull request #2506 from mindw0rm/DenyTeleportBugfix 
Bugfixes for deny-teleport
 2019-10-23 14:37:20 -04:00
mindw0rm
91108a5df9 Merge branch 'breaking' into UntrustedVisit 2019-10-22 17:21:24 +02:00
mindw0rm
e5e522bc31 Merge branch 'breaking' into DenyTeleportBugfix 2019-10-22 17:20:43 +02:00
Matt
5741d5f6a0
Merge pull request #2533 from mindw0rm/PlaceFlagBugfix 
Place flag bugfix (fixxes issue #2524)
 2019-10-21 21:27:48 -04:00
Matt
8b30d6a7ff
Merge pull request #2537 from IntellectualSites/dependabot/gradle/com.google.code.gson-gson-2.8.6 
Bump gson from 2.8.0 to 2.8.6
 2019-10-19 17:45:28 -04:00
Matt
108b84d8b1
Merge pull request #2527 from IntellectualSites/dependabot/gradle/com.squareup.retrofit2-retrofit-2.6.2 
Bump retrofit from 2.4.0 to 2.6.2
 2019-10-19 17:44:37 -04:00
Matt
469a4f25e5
Merge branch 'breaking' into dependabot/gradle/com.squareup.retrofit2-retrofit-2.6.2 2019-10-19 17:44:27 -04:00
Matt
c49369bc7e
Merge pull request #2538 from IntellectualSites/dependabot/gradle/org.ow2.asm-asm-7.2 
Bump asm from 7.1 to 7.2
 2019-10-19 17:43:25 -04:00
Matt
46b5f01bbc
Merge pull request #2536 from IntellectualSites/dependabot/gradle/com.squareup.okhttp3-okhttp-4.2.2 
Bump okhttp from 3.14.0 to 4.2.2
 2019-10-19 17:43:13 -04:00
dependabot-preview[bot]
d7d9b1793f
Bump okhttp from 3.14.0 to 4.2.2 
Bumps [okhttp](https://github.com/square/okhttp) from 3.14.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-19 21:40:45 +00:00
dependabot-preview[bot]
e029cc3fa1
Bump retrofit from 2.4.0 to 2.6.2 
Bumps [retrofit](https://github.com/square/retrofit) from 2.4.0 to 2.6.2.
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/retrofit/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-19 21:40:43 +00:00
Matt
53e80e4359
Merge pull request #2535 from IntellectualSites/dependabot/gradle/com.squareup.okio-okio-2.4.1 
Bump okio from 2.2.2 to 2.4.1
 2019-10-19 17:39:38 -04:00
dependabot-preview[bot]
427cf081e3
Bump okio from 2.2.2 to 2.4.1 
Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases)
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-19 21:37:55 +00:00
Matt
c103504fc8
Merge pull request #2529 from IntellectualSites/dependabot/gradle/org.jetbrains.kotlin-kotlin-stdlib-1.3.50 
Bump kotlin-stdlib from 1.3.30 to 1.3.50
 2019-10-19 17:36:40 -04:00
mindw0rm
20957a75d5 use a new Location convert function to ensure that there will be no side effects 2019-10-18 08:02:44 +02:00
mindw0rm
dd715a9c8a Revert "copy yaw and pitch when converting between Bukkit Location and PlotSquared Location" 
Undo this since I can't guarantee that there aren't side effects.
 2019-10-18 07:51:01 +02:00
mindw0rm
24d82e562a merge upstream changes 2019-10-18 07:44:04 +02:00
NotMyFault
9ad2537ca2
Merge pull request #2517 from IntellectualSites/debugpaste-update 
Improve world generator diagnosis
 2019-10-17 12:23:47 +02:00
dependabot-preview[bot]
4a3c015524
Bump asm from 7.1 to 7.2 
Bumps asm from 7.1 to 7.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 15:17:55 +00:00
dependabot-preview[bot]
53e94cc001
Bump gson from 2.8.0 to 2.8.6 
Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 15:17:37 +00:00
mindw0rm
039b7aee9e Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into UntrustedVisit 2019-10-10 20:34:41 +02:00
mindw0rm
0bcaaf3c0b copy yaw and pitch when converting between Bukkit Location and PlotSquared Location 2019-10-10 20:33:25 +02:00
mindw0rm
5315e1e337 let untrusted-visit override deny-teleport 2019-10-10 20:32:48 +02:00
mindw0rm
1f4f78a179 this can be done more elegantly 2019-10-10 01:53:27 +02:00
mindw0rm
599ef8aa44 Bugfix for #2524 (place flag) 2019-10-10 01:36:40 +02:00
Matt
e445f96e0c
Merge pull request #2528 from IntellectualSites/dependabot/gradle/org.yaml-snakeyaml-1.25 
Bump snakeyaml from 1.23 to 1.25
 2019-10-07 13:49:52 -04:00
Matt
9a8aa7a4e5
Merge pull request #2530 from IntellectualSites/dependabot/gradle/org.projectlombok-lombok-1.18.10 
Bump lombok from 1.18.8 to 1.18.10
 2019-10-07 13:47:28 -04:00
NotMyFault
a3905c68cf
Fix links 2019-10-07 19:20:48 +02:00