dordsor21
6efd581500
Merge branch 'v6' into v7
...
# Conflicts:
# .github/workflows/codeql.yml
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Caps.java
# Core/src/main/java/com/plotsquared/core/command/Cluster.java
# Core/src/main/java/com/plotsquared/core/command/Continue.java
# Core/src/main/java/com/plotsquared/core/command/Copy.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/command/Visit.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# build.gradle.kts
2023-01-17 11:51:39 +00:00
Jordan
39d2f1a72c
chore: remove uses of deprecated Permissions class and add javadoc notes ( #3930 )
...
- Closes #3907
2023-01-15 14:08:59 +01:00
dordsor21
c83b13e374
Merge branch 'v6' into v7
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/command/Chat.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegExUtil.java
# build.gradle.kts
# gradle/libs.versions.toml
2022-06-16 15:25:33 +01:00
Alexander Brandes
3d5c694daa
chore: Comply with OSSRH licensing guidelines ( #3684 )
2022-06-15 20:17:17 +02:00
Pierre Maurice Schwang
62ee60a76c
Update MiniMessage to 4.10.1 ( #3617 )
...
* chore!: bump MiniMessage to 4.10.1
BREAKING CHANGE: bumping MiniMessage and Adventure removes the adventure Template class and breaks the whole messaging system api wise
* chore: fix minimessage messages, fix circular method reference
2022-05-14 17:05:28 +02:00
NotMyFault
25095f4546
chore: Welcome 2022
2022-01-02 22:22:19 +01:00
Alex
47ae79e123
Revert "refactor: Address MiniMessage deprecations ( #3354 )" ( #3371 )
...
This reverts commit f086826942288bcdfb99ee8eff450cd7cf0db038.
2021-12-14 23:04:36 +01:00
Alex
f086826942
refactor: Address MiniMessage deprecations ( #3354 )
...
* refactor: Address MiniMessage deprecations
* refactor: More MiniMessage deprecations
* Move away from our `Templates#of`
* Address comments
* style: Address migration style issues
* docs: Add javadoc link for MiniMessage
2021-12-13 09:48:34 +01:00
Alex
48c7a3e94e
refactor: Use player friendly done message on restricted building ( #3309 )
2021-11-02 13:32:04 +00:00
Patrick "IPat" Hein
8a244d12fc
Fix if-condition limited to roads for animal attack cancelling on plots ( #3079 )
...
* Negate mob-place flag debug message
* fixed a little typo :)
* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074
* Basic dragon egg interact bugfix (Left-click interaction)
* Lifted admin if-condition out of roads (out-of-plot) only block (for animals)
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-06-02 19:55:35 +02:00
NotMyFault
3748d8e246
Minor cleanup in favor of Java 16
...
- Addressing a few command deprecations during the major release superseded by toggles
- Don't swallow SQL warnings in loggers behind debug, as it's often set to false
- Deleted JavaVersionCheck, it's part of ServerLib.
2021-05-15 20:39:16 +02:00
Alexander Söderberg
57fc51d013
Initial annotation usage cleanup + EditorConfig
2021-01-09 22:28:41 +01:00
N0tMyFaultOG
e8642df674
Update licenses to 2021
...
Happy new year 🎆
2021-01-01 00:19:45 +01:00
N0tMyFaultOG
81c72ee5d9
Finish up permissions
2020-11-02 21:03:46 +01:00
N0tMyFaultOG
fed7f89f96
Fix compiling
2020-11-02 11:58:07 +01:00
N0tMyFaultOG
aefa629509
Generify permissions thru Permission class
...
- Fixed a few improper permissions
- Fixed a couple of typos
2020-11-02 00:55:58 +01:00
Mariell Hoversholm
c3069a425d
Format licence headers
2020-10-08 14:02:08 +02:00
N0tMyFaultOG
ec23fcdd75
Rewrite build scripts
...
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
2020-10-08 14:02:08 +02:00
N0tMyFaultOG
4a220f9bfb
Update license header
2020-08-15 14:59:29 +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
221d299052
Fix a few remaining merge issues (+1 squashed commits)
...
Squashed commits:
[8c6b55dd4] Fix a few remaining merge issues
2020-07-24 17:57:16 +01:00
dordsor21
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01:00
