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,467 Commits 231 Branches 71 Tags 86 MiB
797d3ed362
Commit Graph

4467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NotMyFault
3f7f6af051
Merge pull request #2913 from IntellectualSites/features/v6/queue-features 
Features/v6/queue features
 2020-11-01 21:16:32 +01:00
dordsor21
ee9b2e8bf8
Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/resources/lang/messages_en.json
 2020-11-01 18:58:24 +00:00
dordsor21
0b968abfe4
fix merging conflicts 2020-11-01 17:45:38 +00:00
N0tMyFaultOG
7e7ecd6a0f Update paperlib 2020-11-01 17:17:12 +01:00
dordsor21
7e9a9e14c7 Fix various instances where Adventure is being used incorrectly 2020-10-25 22:38:00 +00:00
Mariell Hoversholm
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
Mariell Hoversholm
38333a6d11 Update to Gradle 6.7 2020-10-17 21:10:02 +01:00
NotMyFault
4213957d76
Delete dependabot.yml 2020-10-12 12:21:32 +02:00
dordsor21
565f9e3e29
5.13.8 2020-10-11 19:27:01 +01:00
dordsor21
a1bfc1cb26
correctly handle road flags 2020-10-11 19:24:50 +01:00
dordsor21
cfd432886d
Correctly handle road flags 2020-10-11 19:19:17 +01:00
N0tMyFaultOG
191666a2f2 Fix logo 2020-10-11 13:03:22 +02:00
N0tMyFaultOG
aeeae7c167 Fix links not being clickable 2020-10-11 12:47:49 +02:00
N0tMyFaultOG
08c7d4d15e Remove dead imports 2020-10-09 21:03:23 +02:00
N0tMyFaultOG
29b92659c7 Fix typos 2020-10-09 20:50:12 +02:00
N0tMyFaultOG
209f25a5cf Update default branch 2020-10-09 20:21:57 +02:00
N0tMyFaultOG
4622f4b51d Fix plot leave 2020-10-09 20:21:02 +02:00
dordsor21
4d51dc9b6c
Switch to translateable captions 2020-10-09 17:47:51 +01:00
dordsor21
76b992509b
use format not silly round stuff 2020-10-09 17:29:05 +01:00
dordsor21
925978db8f
change default lighting to 1 2020-10-09 17:26:52 +01:00
dordsor21
c0e90ddb33
increase interval of progress notify 2020-10-09 17:25:48 +01:00
dordsor21
a7a29eaf97
Correctly cancel notify tasks and add notifications to commands 2020-10-09 17:24:59 +01:00
dordsor21
a451d2d6f2
Fix the injection 2020-10-09 16:34:59 +01:00
dordsor21
914429ab4f
Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-10-09 15:23:09 +01:00
N0tMyFaultOG
f721a7c66c Update build.gradle.kts 2020-10-08 21:25:09 +02:00
N0tMyFaultOG
bba499649b No need to point if PAPI is not in use 2020-10-08 20:56:33 +02:00
N0tMyFaultOG
f9cd54c445 Shift logger.info -> error when running in an outdated environment 2020-10-08 20:54:06 +02:00
N0tMyFaultOG
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
N0tMyFaultOG
6b37d678df Fix plot template tab completion 2020-10-08 20:47:43 +02:00
N0tMyFaultOG
02698b3a0e Fix plot grant tab completion 2020-10-08 20:42:17 +02:00
N0tMyFaultOG
6f0512c18c Fix plot set tab completions 2020-10-08 20:16:29 +02:00
N0tMyFaultOG
e46b38b301 Fix plot set values 2020-10-08 19:51:42 +02:00
N0tMyFaultOG
5841817fb5 Missing space 2020-10-08 19:29:09 +02:00
N0tMyFaultOG
e28fb49015 Add override permission for /plot music 2020-10-08 19:27:05 +02:00
N0tMyFaultOG
841eef6a52 Fix done message on backup and add done message to grant 2020-10-08 18:57:11 +02:00
Mariell Hoversholm
2eee1ef203 Fix log4j 2020-10-08 14:33:48 +02:00
Mariell Hoversholm
cd605f4996 Relocate log4j, move slf4j declaration 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
54a8482a88 Minecraft does not always provide slf4j 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c198305b5e Add missing relocations 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
a637a8970b Add maven publishing 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
d97f68eec0 Address review issues 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
9b1dc7d42e She compiles! 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
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
dordsor21
b55d836871
5.13.7 2020-10-07 11:59:44 +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
Aurora
56e6922279 Remove BungeePerms UUID fetcher 2020-10-04 13:26:56 +02:00