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 |
|
Aurora
|
56e6922279
|
Remove BungeePerms UUID fetcher
|
2020-10-04 13:26:56 +02:00 |
|
Alexander Söderberg
|
6e2f738d86
|
Stop relying on maxim's repo as it's very unreliable.
|
2020-10-04 12:24:37 +01:00 |
|
dordsor21
|
85a23442cc
|
bump minimessage version to fix build
|
2020-09-18 12:22:01 +01:00 |
|
N0tMyFaultOG
|
02bd83bd90
|
Merge v5 into v6
|
2020-08-24 14:33:53 +02:00 |
|
N0tMyFaultOG
|
3a8fa9f5b6
|
Update WorldEdit version
That doesn't appear to break stuff 👀
|
2020-08-22 13:18:00 +02:00 |
|
Alexander Söderberg
|
45e75cc06e
|
Merge branch 'v6' into features/v6/services
|
2020-08-21 23:02:52 +02:00 |
|
Alexander Söderberg
|
28d6d4db92
|
Fix shading mess and make the plugin start
|
2020-08-16 12:44:10 +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 |
|
N0tMyFaultOG
|
d6dfa9a0b9
|
https
|
2020-08-11 20:12:31 +02:00 |
|
N0tMyFaultOG
|
7c756304b5
|
1.16.2 support
- Bump EssentialsX version to the latest release
|
2020-08-11 16:20:33 +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
|
b8b3e1e72a
|
Merge branch 'v6' into feature/v6/pipeline-queue
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
|
2020-07-24 18:18:42 +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
|
3180d2ddf2
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
|
2020-07-24 17:15:58 +01:00 |
|
Alexander Söderberg
|
e90170a384
|
Merge remote-tracking branch 'origin/v6' into feature/v6/json
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
# Core/pom.xml
# Core/src/main/java/com/plotsquared/core/PlotAPI.java
# Core/src/main/java/com/plotsquared/core/PlotPlatform.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/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Grant.java
# Core/src/main/java/com/plotsquared/core/command/Inbox.java
# Core/src/main/java/com/plotsquared/core/command/Load.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/command/Setup.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/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
# Core/src/main/java/com/plotsquared/core/util/Permissions.java
|
2020-07-24 17:28:52 +02:00 |
|
dordsor21
|
e53c53bb4a
|
Merge branch 'v6' into feature/v6/pipeline-queue
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
|
2020-07-24 12:21:40 +01:00 |
|
dordsor21
|
c3322021d0
|
mavenLocal, poms
|
2020-07-23 18:02:29 +01:00 |
|
N0tMyFaultOG
|
a7de76d150
|
Fix dependencies
|
2020-07-23 15:03:57 +02:00 |
|
dordsor21
|
ed77522c08
|
Add wna block setting, use WorldEdit worlds rather than Strings.
|
2020-07-17 14:38:50 +01:00 |
|
N0tMyFaultOG
|
a52249513e
|
Update MVdW version
|
2020-07-15 12:05:42 +02:00 |
|
Alexander Söderberg
|
34655b8d41
|
Add (untested) MVdWPlaceholderAPI support
|
2020-07-14 20:41:08 +02:00 |
|
Alexander Söderberg
|
198bcfdf4d
|
Merge branch 'v6' into feature/v6/json
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/configuration/Caption.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/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
|
2020-07-14 19:25:14 +02:00 |
|
Alexander Söderberg
|
8eb903ad72
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
|
2020-07-14 19:18:08 +02:00 |
|
Alexander Söderberg
|
97fed21811
|
Merge branch 'v6' into feature/v6/platform
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Purge.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/database/SQLManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.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/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java
# Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java
# Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
# Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
|
2020-07-14 19:05:05 +02:00 |
|
Alexander Söderberg
|
510ea56431
|
Finalize DI stuff
|
2020-07-14 18:49:40 +02:00 |
|
Alexander Söderberg
|
33f2ff7e6d
|
Merge branch 'v6' into feature/v6/slf4j
|
2020-07-13 23:11:40 +02:00 |
|
Alexander Söderberg
|
a1f262b5b2
|
Fix gradle setup and replace all debug calls
|
2020-07-13 22:51:57 +02:00 |
|
Alexander Söderberg
|
b109b76120
|
Nevermind, it doesn't allow for relocations
|
2020-07-13 20:50:49 +02:00 |
|
Alexander Söderberg
|
d141b040d6
|
Fix relocations
|
2020-07-13 20:45:04 +02:00 |
|
Alexander Söderberg
|
e84d82315c
|
Add log4j config (this might work :p)
|
2020-07-13 20:39:52 +02:00 |
|
Alexander Söderberg
|
e88da3cea9
|
Add chunk coordinator
|
2020-07-12 20:58:48 +02:00 |
|
Alexander Söderberg
|
c0f69f321d
|
Guice progress
|
2020-07-10 22:12:37 +02:00 |
|
Alexander Söderberg
|
090bd69be5
|
Merge branch 'v6' into feature/v6/json
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
|
2020-07-08 15:22:02 +02:00 |
|
N0tMyFaultOG
|
5004005c5a
|
Fixes PS-65
EssentialsX uses paperlib 1.0.4 where we compile explicitly against 1.0.2
|
2020-07-08 12:21:31 +02:00 |
|
Alexander Söderberg
|
c8a8806e7d
|
Component progress. The plugin is **very** broken right now.
|
2020-07-05 13:41:40 +02:00 |
|
Alexander Söderberg
|
c784c69eb3
|
progress
|
2020-07-04 18:53:03 +02:00 |
|
MattBDev
|
49c35ec084
|
Resolve NMF's concerns
|
2020-06-29 22:05:32 -04:00 |
|
MattBDev
|
cb04c183a8
|
Update to 1.16.1
|
2020-06-26 20:38:30 -04:00 |
|
Alexander Söderberg
|
4b997d42df
|
Some slf4j progress
|
2020-06-26 11:03:42 +02:00 |
|
Alexander Söderberg
|
b9b0d89b5f
|
Replace the R-tree library with PRTree. Fix SquirrelID shading issues. Bump the version to 5.12.0
|
2020-05-25 15:13:31 +02:00 |
|
NotMyFault
|
09327b0128
|
Merge branch 'v5' into features/v5/uuid
|
2020-05-25 13:13:29 +02:00 |
|
NotMyFault
|
8d1033f725
|
Merge branch 'v5' into v5
|
2020-05-25 12:58:32 +02:00 |
|
dependabot-preview[bot]
|
67fbfb0f2d
|
Bump api from 5.0 to 5.1
Bumps [api](https://github.com/lucko/LuckPerms) from 5.0 to 5.1.
- [Release notes](https://github.com/lucko/LuckPerms/releases)
- [Commits](https://github.com/lucko/LuckPerms/compare/v5.0...v5.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-05-25 09:13:10 +00:00 |
|
darbyjack
|
4b0df80878
|
Updated PAPI & EssX dependency to ensure compatibility
|
2020-05-25 00:09:28 -05:00 |
|
Alexander Söderberg
|
a882555d1b
|
Merge branch 'v5' into features/v5/uuid
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/command/Visit.java
|
2020-05-24 19:00:21 +02:00 |
|
Aurora
|
98322d5d11
|
Add BungeePerms UUID service. This should probably work.
|
2020-05-24 14:32:34 +02:00 |
|
Alexander Söderberg
|
2875b050c5
|
Add plugin UUID services. They probably work.
|
2020-05-23 19:43:32 +02:00 |
|
Alexander Söderberg
|
eee04ab87d
|
Shade guava-mini into the bukkot module
|
2020-05-22 22:04:46 +02:00 |
|
Alexander Söderberg
|
a833803bdf
|
Shade rx into the bukkot module
|
2020-05-22 22:04:46 +02:00 |
|