Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-05 09:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,938 Commits 13 Branches 68 Tags 88 MiB
87285e08dc
Commit Graph

105 Commits

Author SHA1 Message Date
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
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
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
Alexander Söderberg
d2af342a5d Shade r-tree into the bukkit module 2020-05-22 22:04:46 +02:00
Alexander Söderberg
29f2863cf4
Progress 2020-05-17 17:26:48 +02:00
Alexander Söderberg
c58309b385 Add { transitive = false } to HV 2020-05-16 21:37:14 +02:00
Alexander Söderberg
31edffcb63 Begin working on a platform specific world management system 
This should make world management a fair bit cleaner
 2020-05-16 21:37:14 +02:00
dordsor21
20c487238a PlotSquared-Core please 2020-05-14 14:45:27 +01:00
Alexander Söderberg
f4729310fa
Include the core dependency in the Bukkit module 2020-05-14 14:52:43 +02:00
Alexander Söderberg
2f02f4392a
Fix names of shaded jars 2020-05-14 14:51:23 +02:00
Alexander Söderberg
b7f708dcd6
Fix gradle config 2020-05-14 14:32:20 +02:00
Alexander Söderberg
edaf396894
Merge features/v5/internal-updates into api/v5/packages 2020-04-16 06:11:03 +02:00
Alexander Söderberg
2377ce1123 Relocate metrics properly 2020-04-11 19:52:45 +02:00
Alexander Söderberg
6c1caac731 Rename jar from BukkitAPI to Bukkit 2020-04-11 02:57:00 +02:00
Alexander Söderberg
9c3c42c3e6 Rename published maven artifacts 
# Conflicts:
#	Bukkit/build.gradle
#	Core/build.gradle
 2020-04-11 02:54:34 +02:00
Alexander Söderberg
5fc33dcc06 Rename published maven artifacts 2020-04-11 02:39:02 +02:00
MattBDev
dfa977a020 Moved more packaged based on feedback 2020-04-10 20:19:18 -04:00
NotMyFault
a3759f93a2 Add placeholders 2020-02-16 20:33:24 +01:00
NotMyFault
24b6b23d25 Bind update notifications to spigot resource updates 
The notification permission could be moved back into the other class, but well
 2020-02-16 01:33:43 +01:00
MattBDev
1516edbeca Update dependencies 
Changed gradle to new group id and repository. Updated paper-api to 1.15.2
 2020-02-11 15:25:42 -05:00
NotMyFault
f71f481ff3
Compile against 1.15.2 2020-01-22 23:54:37 +01:00
NotMyFault
568e9537ec Bump WorldEdit version to 7.0.1 2019-12-27 17:33:52 +01:00
NotMyFault
f97e52ea0b
Fixes building against 1.15 2019-12-25 10:40:54 +01:00
Jesse Boyd
4c90523121
use 1.15 spigot 2019-12-25 02:39:41 +00:00
dependabot-preview[bot]
7d8a5213dd 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-12-07 19:34:28 +01:00
NotMyFault
241589fdb0 Revert "Bump retrofit from 2.4.0 to 2.6.2" 
This reverts commit 1097f44feb.
 2019-12-07 18:56:43 +01:00
dependabot-preview[bot]
eb09e0a633 Bump okhttp from 3.12.0 to 4.2.2 
Bumps [okhttp](https://github.com/square/okhttp) from 3.12.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.12.0...parent-4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:49:39 +01:00
dependabot-preview[bot]
1097f44feb 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-12-07 18:47:38 +01:00
dependabot-preview[bot]
e5423b5e08 Bump kotlin-stdlib from 1.3.50 to 1.3.61 
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.50 to 1.3.61.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.61/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.50...v1.3.61)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:41:32 +01:00