EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity
4,341 Commits 231 Branches 71 Tags 86 MiB
be9d9264ae
Commit Graph

1655 Commits

Author SHA1 Message Date
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
f80e8c8d11
For sake of allowing v5 -> v6 2020-09-25 20:08:28 +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
e974fe5dc7
Merge branch 'v6' into features/v6/queue-features 2020-09-18 12:22:32 +01:00
dordsor21
85a23442cc
bump minimessage version to fix build 2020-09-18 12:22:01 +01:00
dordsor21
819902c24e
Fix licenses 2020-09-14 22:00:09 +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
dordsor21
1552a8e74b
Add option to change lighting behaviour in queues 2020-09-11 14:18:50 +01:00
dordsor21
f0e9a8c5fe
Implement progress subscribers 2020-09-11 12:59:40 +01:00
dordsor21
a98b23af02
progress subscriber 2020-09-11 11:20:38 +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
b12e9832c9 Update pom.xml 2020-09-02 17:20:54 +02:00
N0tMyFaultOG
0f9554c717 Merge branch 'v5' into v6 2020-09-02 17:19:12 +02:00
N0tMyFaultOG
7a529e156d Add deb for onBlockIgnite event 2020-09-02 17:03:56 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
NotMyFault
03c889383b
Merge pull request #2908 from IntellectualSites/dependabot/gradle/v5/org.yaml-snakeyaml-1.26 
Bump snakeyaml from 1.25 to 1.26
 2020-09-02 16:15:26 +02:00
dependabot[bot]
7c53bfc870
Bump snakeyaml from 1.25 to 1.26 
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
32a8dcd411
Bump annotations from 20.0.0 to 20.1.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
N0tMyFaultOG
b3c77ef099 Merge branch 'dependabot/gradle/v5/org.jetbrains.kotlin-kotlin-stdlib-1.4.0' into v5 2020-09-02 12:57:05 +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
dependabot-preview[bot]
acb0bd95f2
Bump kotlin-stdlib from 1.3.72 to 1.4.0 
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.72 to 1.4.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.0/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.72...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-22 23:05:56 +00:00
NotMyFault
5d73b17415
Merge pull request #2899 from IntellectualSites/dependabot/gradle/v5/org.jetbrains-annotations-20.0.0 
Bump annotations from 19.0.0 to 20.0.0
 2020-08-23 01:04:40 +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
N0tMyFaultOG
fabb9b6fd7 More json stuff 2020-08-17 18:15:29 +02:00
Hannes Greule
aacf15757f Use less confusing variable name 2020-08-17 15:32:17 +02:00
Hannes Greule
4789327378 Encapsulate fields 2020-08-17 15:17:40 +02:00
N0tMyFaultOG
c6a368d6f2 More json fixes 2020-08-17 13:24:15 +02:00
dependabot-preview[bot]
869a579655
Bump annotations from 19.0.0 to 20.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 19.0.0 to 20.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-17 09:08:30 +00:00
Alexander Söderberg
7cd1e8ea76
Fix command registration 2020-08-17 04:39:59 +02:00
Alexander Söderberg
351ae1b2c7
Synchronize auto queries 2020-08-17 01:27:45 +02:00
Hannes Greule
457f3e25cc resolve rebase issue 2020-08-17 01:10:46 +02:00
Hannes Greule
41c670450b Remove PlotFilter 2020-08-17 01:10:46 +02:00
Hannes Greule
f636db49f7 Remove SetupObject 2020-08-17 01:10:46 +02:00
Hannes Greule
505bba7612 Fix recursive call 2020-08-17 00:53:39 +02:00
Hannes Greule
9b086b3f2a Insert missing keys into message files 2020-08-17 00:29:53 +02:00
N0tMyFaultOG
f9d7d2d1dd Fix clickable messages 2020-08-16 19:43:27 +02:00
N0tMyFaultOG
e9efa3f2d3 Fix some translation issues 2020-08-16 18:24:54 +02:00
dordsor21
665a72a08f
Fill out a lot more JavaDoc. 
I've left DB stuff alone
 2020-08-16 13:22:49 +01:00
Alexander Söderberg
a4c9ed90b7
Fix startup issues and make messages send properly 2020-08-16 13:49:16 +02:00
dordsor21
12def37194
clean up some javadoc stuff 2020-08-16 11:34:08 +01:00
Alexander Söderberg
ed2302e545
Remove illegal import 2020-08-16 12:10:19 +02:00
N0tMyFaultOG
618adb913d Update license and remove dead module entries 2020-08-15 19:17:29 +02:00
N0tMyFaultOG
4a220f9bfb Update license header 2020-08-15 14:59:29 +02:00
NotMyFault
300abd868a
Merge pull request #2888 from IntellectualSites/fix-conversion 
Fix problem with config creation
 2020-08-14 18:36:57 +02:00
Alexander Söderberg
87f0b1fc97
Add service system and rewrite Auto to use the service system 2020-08-14 17:24:34 +02:00
NotMyFault
5b27b652e7
Fix color tag 2020-08-14 12:52:00 +02:00
N0tMyFaultOG
5e20c871a5 Fix metrics setting 2020-08-14 11:36:17 +02:00
NotMyFault
56fb892818
Fix brackets 2020-08-14 00:37:06 +02:00
N0tMyFaultOG
7f104c249a Permission cleanup 
- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command

I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.
 2020-08-13 23:32:13 +02:00
N0tMyFaultOG
0eeface374 Remove old translations 2020-08-13 21:37:28 +02:00
N0tMyFaultOG
ffe1e1e40d Core is Core 2020-08-13 21:25:17 +02:00
N0tMyFaultOG
5efdef19cf Remove dead asset setting 2020-08-13 21:16:30 +02:00
N0tMyFaultOG
c9fae6a070 Remove old translation setup and move commands to templates 2020-08-13 21:11:07 +02:00
N0tMyFaultOG
2b17f730d4 Merge v5 into v6 2020-08-12 18:20:37 +02:00
Luca
64181c6ab8
Update de-DE.yml 
adjusted grammar
 2020-08-11 19:29:40 +02:00
JunTVDE
987d9a267c added german translation for flag-descriptions to de-DE.yml 2020-08-09 13:05:40 +02:00
EinDev
b46a19f5ca Keep player names, so they don't have to be looked up again. 
That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread.
As the player enters the Name, we don't have to look it up again.

Fixes PS-96
 2020-08-08 18:07:49 +02:00
dordsor21
7bad242944
Merge branch 'v6' into feature/v6/json. It builds! 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Clear.java
#	Core/src/main/java/com/plotsquared/core/command/Debug.java
#	Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
#	Core/src/main/java/com/plotsquared/core/command/Relight.java
#	Core/src/main/java/com/plotsquared/core/command/Set.java
#	Core/src/main/java/com/plotsquared/core/command/Template.java
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
#	Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
#	Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegionManager.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
#	build.gradle
 2020-08-08 13:20:30 +01:00
dordsor21
74a5c48214
Finish up core and bukkit json 2020-08-08 12:16:48 +01:00
N0tMyFaultOG
c31c4b4286 More work 2020-08-07 18:52:45 +02:00
dordsor21
7f29b5d1e8
ComponentPreset inventory to json 2020-08-07 13:22:10 +01:00