EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity
4,267 Commits 282 Branches 82 Tags
c3069a425d1ae2f9d58c8383b31509d2b894693c
Commit Graph

4267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Söderberg
6e2f738d86 Stop relying on maxim's repo as it's very unreliable. 2020-10-04 12:24:37 +01:00
Hannes Greule
81d0bf6f04 Prevent blocks from getting waterlogged 
In some cases, the PlayerInteractEvent doesn't cancel right clicks on blocks that can be waterlogged
 2020-10-03 21:54:14 +02:00
dordsor21
95f509d337 Stop forcing loiwercase world names 2020-10-02 15:08:14 +01:00
dordsor21
2f5ce67154 add back setShouldAbortSpawn 2020-09-29 15:55:08 +01:00
dordsor21
89318be5f4 Apply e2f9b4245b to paper listener too 2020-09-29 15:53:23 +01:00
dordsor21
8c4bb4140a 5.13.6 2020-09-20 19:51:54 +01:00
dordsor21
ff83931a3f Fix plot grant 2020-09-20 19:42:13 +01:00
N0tMyFaultOG
2468be4736 Merge branch 'v6' of https://github.com/IntellectualSites/PlotSquared into v6 2020-09-20 17:36:35 +02:00
Hannes Greule
4e835ed3ff Add missing command description 2020-09-20 00:51:54 +02:00
dordsor21
41f494fbff Remove jetbrains annotations 2020-09-18 12:45:26 +01:00
dordsor21
85a23442cc bump minimessage version to fix build 2020-09-18 12:22:01 +01:00
dordsor21
a822a70f00 bump minimessage so it compiles 2020-09-18 12:11:34 +01:00
dordsor21
554efbb057 Merge branch 'v5' into v6 
# Conflicts:
#	.github/CODEOWNERS
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Alias.java
#	Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
#	Core/src/main/java/com/plotsquared/core/command/Music.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/flag/types/BlockTypeWrapper.java
#	build.gradle
 2020-09-11 15:44:04 +01:00
dordsor21
8547533210 update pom 2020-09-11 15:04:09 +01:00
dordsor21
d843d1715d Allow /plot home [area|world] 2020-09-11 15:03:48 +01:00
NotMyFault
648953ec1f 5.13.5 2020-09-11 12:27:23 +02:00
NotMyFault
5463f15633 Add pigstep music disc 2020-09-11 01:16:57 +02:00
NotMyFault
0c6113b0d1 5.13.4 2020-09-09 23:31:30 +02:00
Hannes Greule
c5906e780a Merge pull request #2912 from IntellectualSites/fix/v5/blocktypewrapper 
Add default namespace when wrapping block categories by their ids
 2020-09-08 18:50:08 +02:00
Hannes Greule
f2355a76d6 Add default namespace when wrapping block categories by their ids 2020-09-06 23:36:36 +02:00
Alexander Söderberg
0aeca40137 Take player visibility into account when sending notify-enter and notify-leave messages. Fixes PS-103. 2020-09-05 18:48:58 +02:00
Hannes Greule
5c48e4ad19 Add missing license header 2020-09-05 18:39:56 +02:00
Hannes Greule
f6d1e2b3b8 Check TileState manually on 1.13.2, fixes PS-122 2020-09-05 18:39:56 +02:00
NotMyFault
37010d92ee Create CODEOWNERS 2020-09-05 13:42:11 +02:00
Hannes Greule
babad3ab6d Don't validate plot aliases with offline players (Fixes PS-126) 2020-09-04 14:49:02 +02:00
N0tMyFaultOG
b12e9832c9 Update pom.xml 2020-09-02 17:20:54 +02:00
N0tMyFaultOG
0f9554c717 Merge branch 'v5' into v6 2020-09-02 17:19:12 +02:00
N0tMyFaultOG
d19dde2f85 Add more debugs 2020-09-02 17:18:41 +02:00
N0tMyFaultOG
7a529e156d Add deb for onBlockIgnite event 2020-09-02 17:03:56 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
NotMyFault
03c889383b Merge pull request #2908 from IntellectualSites/dependabot/gradle/v5/org.yaml-snakeyaml-1.26 
Bump snakeyaml from 1.25 to 1.26
 2020-09-02 16:15:26 +02:00
NotMyFault
da54478767 Merge pull request #2907 from IntellectualSites/dependabot/gradle/v5/org.jetbrains-annotations-20.1.0 
Bump annotations from 20.0.0 to 20.1.0
 2020-09-02 16:14:26 +02:00
NotMyFault
acf9c2554f Merge pull request #2904 from IntellectualSites/dependabot/gradle/v5/org.ajoberstar.grgit-4.0.2 
Bump org.ajoberstar.grgit from 4.0.1 to 4.0.2
 2020-09-02 16:12:56 +02:00
dependabot[bot]
7c53bfc870 Bump snakeyaml from 1.25 to 1.26 
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26.
- [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
32a8dcd411 Bump annotations from 20.0.0 to 20.1.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:44 +00:00
dependabot[bot]
20b4cec0ca Bump org.ajoberstar.grgit from 4.0.1 to 4.0.2 
Bumps org.ajoberstar.grgit from 4.0.1 to 4.0.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 14:10:39 +00:00
NotMyFault
c51c938e8d Merge pull request #2903 from IntellectualSites/dependabot/add-v2-config-file 
Create Dependabot config file
 2020-09-02 16:10:14 +02:00
dependabot-preview[bot]
49984f2560 Create Dependabot config file 2020-09-02 13:55:15 +00:00
N0tMyFaultOG
b3c77ef099 Merge branch 'dependabot/gradle/v5/org.jetbrains.kotlin-kotlin-stdlib-1.4.0' into v5 2020-09-02 12:57:05 +02:00
N0tMyFaultOG
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
N0tMyFaultOG
e924a1920e Add message to rgar 2020-09-01 00:02:56 +02:00
NotMyFault
1441cc293c 5.13.3 2020-08-26 13:57:20 +02:00