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
|
c853147635
|
Merge pull request #2870 from IntellectualSites/feature/v6/platform
|
2020-07-14 19:13:00 +02:00 |
|
Alexander Söderberg
|
0294397021
|
Manually resolve a bunch of merge issues
|
2020-07-14 19:10:52 +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
|
7897d78f0d
|
Merge pull request #2868 from IntellectualSites/feature/v6/slf4j
|
2020-07-14 18:49:34 +02:00 |
|
Alexander Söderberg
|
25a58a5c46
|
Merge branch 'v6' into feature/v6/platform
|
2020-07-14 17:45:33 +02:00 |
|
Alexander Söderberg
|
f9e5fd714d
|
Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform
|
2020-07-14 17:07:03 +02:00 |
|
Alexander Söderberg
|
55eefd09da
|
Merge branch 'v6' into feature/v6/json
|
2020-07-14 16:52:40 +02:00 |
|
Alexander Söderberg
|
0ce1f3e0f6
|
Send special message when caption cannot be found
|
2020-07-14 16:36:13 +02:00 |
|
Alexander Söderberg
|
99be181aea
|
Migrate some more captions
|
2020-07-14 16:31:58 +02:00 |
|
Alexander Söderberg
|
fbf6a3517d
|
Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with
|
2020-07-14 15:04:31 +02:00 |
|
Alexander Söderberg
|
1dc4da8beb
|
Fix issues from previous merge
|
2020-07-14 13:21:59 +02:00 |
|
Alexander Söderberg
|
1908588fcb
|
Change expansion author and version
|
2020-07-14 13:17:21 +02:00 |
|
Alexander Söderberg
|
af7db08036
|
Add new placeholder system
|
2020-07-14 13:14:02 +02:00 |
|
NotMyFault
|
e72ce9c90e
|
Update gradle.yml
|
2020-07-14 12:44:11 +02:00 |
|
NotMyFault
|
32264ae5e3
|
Update gradle.yml
|
2020-07-14 12:43:45 +02:00 |
|
Alexander Söderberg
|
33f2ff7e6d
|
Merge branch 'v6' into feature/v6/slf4j
|
2020-07-13 23:11:40 +02:00 |
|
Alexander Söderberg
|
6664d49928
|
Prefix all log messages
|
2020-07-13 23:04:27 +02:00 |
|
Alexander Söderberg
|
d648a6d3db
|
Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j
# Conflicts:
# Bukkit/pom.xml
# Core/pom.xml
|
2020-07-13 22:52:10 +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 |
|
N0tMyFaultOG
|
1388f280e6
|
Update module poms
|
2020-07-13 20:46:34 +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 |
|
N0tMyFaultOG
|
c6962ef4d2
|
Shift a few more messages to debug
|
2020-07-13 19:56:34 +02:00 |
|
N0tMyFaultOG
|
f93714a44e
|
Properly add prefixes to messages
|
2020-07-13 13:01:13 +02:00 |
|
Hannes Greule
|
564efd77f7
|
Fix some messages
|
2020-07-12 22:11:23 +02:00 |
|
Hannes Greule
|
5442c7cc2e
|
Start moving commands to new message system
|
2020-07-12 22:06:07 +02:00 |
|
Alexander Söderberg
|
0fa5a16cd0
|
replace remaining debug calls
|
2020-07-12 21:49:05 +02:00 |
|
N0tMyFaultOG
|
1881cdc9ab
|
Revert "Add prefix"
This reverts commit fb2aa44f78.
|
2020-07-12 21:28:38 +02:00 |
|
N0tMyFaultOG
|
fb2aa44f78
|
Add prefix
|
2020-07-12 21:25:22 +02:00 |
|
Alexander Söderberg
|
e88da3cea9
|
Add chunk coordinator
|
2020-07-12 20:58:48 +02:00 |
|
dordsor21
|
14b6f84816
|
fix typos that were c/p over
|
2020-07-12 18:50:04 +01:00 |
|
N0tMyFaultOG
|
ac8841447c
|
6cf2c0ad97 (r40542418)
|
2020-07-12 17:11:25 +02:00 |
|
Alexander Söderberg
|
6cf2c0ad97
|
Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services
|
2020-07-12 17:04:30 +02:00 |
|
dordsor21
|
c045ef698c
|
Add license headers and fix method change in PlotSquared.java
|
2020-07-12 11:42:45 +01:00 |
|
Alexander Söderberg
|
5cdb3f4fd5
|
Add missing injection points
|
2020-07-12 12:25:44 +02:00 |
|
Alexander Söderberg
|
5a5c5721cc
|
fix compiler crashing
|
2020-07-12 07:38:57 +02:00 |
|
dordsor21
|
3a11ffc77a
|
Clean up bukkit listeners by splitting them up
|
2020-07-11 19:03:55 +01:00 |
|
Alexander Söderberg
|
916675fb08
|
Guice progress
|
2020-07-11 17:19:19 +02:00 |
|
dordsor21
|
a2ec404014
|
Fix /plot target nearest
|
2020-07-11 13:40:22 +01:00 |
|
Alexander Söderberg
|
6f6cb4b630
|
More DI progress
|
2020-07-11 05:29:41 +02:00 |
|
Alexander Söderberg
|
c0f69f321d
|
Guice progress
|
2020-07-10 22:12:37 +02:00 |
|
Alexander Söderberg
|
55bf41d2da
|
Remove dumdum static access
|
2020-07-10 19:25:05 +02:00 |
|
Alexander Söderberg
|
7687d7705b
|
Fix merge issue
|
2020-07-10 18:38:14 +02:00 |
|
Alexander Söderberg
|
21ad9a36c8
|
Merge branch 'v6' into feature/v6/platform
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
|
2020-07-10 18:37:18 +02:00 |
|
dordsor21
|
afb72aa102
|
Don't include eggs with spawn*_eggs*
|
2020-07-10 17:31:46 +01:00 |
|
Alexander Söderberg
|
d00dc658df
|
Inject EventDispatcher and PlotListener
|
2020-07-10 18:17:44 +02:00 |
|
Alexander Söderberg
|
2dab7c8dda
|
Inject PlotAreaManager
|
2020-07-10 17:32:07 +02:00 |
|