Commit Graph

67 Commits

Author SHA1 Message Date
NotMyFault
cc6db9ae9e
Merge branch 'v5' into v6 2021-05-15 20:47:01 +02:00
NotMyFault
58ad9db5ed
Jump to Java 16 2021-05-14 01:04:09 +02:00
NotMyFault
ffe298710d
Lazy merge v5/v6 2021-04-28 20:17:10 +02:00
NotMyFault
5cdb7e76fd
Update wiki and issue links 2021-04-28 20:06:19 +02:00
NotMyFault
361b936aa0
Update ServerLib 2021-04-27 11:58:49 +02:00
NotMyFault
9503b0bfc4
Merge branch 'v5' into v6 2021-04-27 11:52:44 +02:00
NotMyFault
823beaf268
Update a few dependencies 2021-04-27 11:46:14 +02:00
NotMyFault
3ada55989f
[ci skip] Setup new issue templates (#2951)
* Setup issue templates

* Exchange issue url
2021-04-26 16:25:15 +02:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
NotMyFault
035ecc1517
Delete dependabot.yml 2020-12-21 10:58:30 +01:00
N0tMyFaultOG
ef95334fe6
Update actions worflow 2020-11-23 18:35:44 +01:00
N0tMyFaultOG
4595534a6f
Update actions workflow 2020-11-23 18:32:28 +01:00
N0tMyFaultOG
db903ebb0a Revert "Update gradle.yml"
This reverts commit e12c83fd83.
2020-11-19 21:05:48 +01:00
N0tMyFaultOG
e12c83fd83 Update gradle.yml 2020-11-19 17:44:57 +01:00
NotMyFault
f33fc092e3
Add java 11 to actions test 2020-11-08 21:48:23 +01:00
NotMyFault
4213957d76
Delete dependabot.yml 2020-10-12 12:21:32 +02:00
N0tMyFaultOG
aeeae7c167 Fix links not being clickable 2020-10-11 12:47:49 +02:00
N0tMyFaultOG
209f25a5cf Update default branch 2020-10-09 20:21:57 +02: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
NotMyFault
37010d92ee
Create CODEOWNERS 2020-09-05 13:42:11 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
dependabot-preview[bot]
49984f2560
Create Dependabot config file 2020-09-02 13:55:15 +00:00
N0tMyFaultOG
02bd83bd90 Merge v5 into v6 2020-08-24 14:33:53 +02:00
N0tMyFaultOG
a1b10a2900 Remove dead files 2020-08-11 17:49:04 +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
NotMyFault
181c5b134f
Update old links 2020-06-27 21:48:15 +02:00
N0tMyFaultOG
6090c7ccac Link issues to new issue tracker for legacy reasons 2020-05-23 01:25:18 +02:00
NotMyFault
5442d43918
Update bug-issue-report-for-plotsquared.md 2020-05-15 16:46:47 +02:00
NotMyFault
acba10ac09
Fix broken url 2020-05-01 17:00:55 +02:00
Alexander Söderberg
06d255ccc2
Create FUNDING.yml 2020-04-20 18:48:22 +02:00
N0tMyFaultOG
70eb588f1f Update issue template for v5/v3 support 2020-04-18 17:04:16 +02:00
NotMyFault
a285404847 Update gradle, actions and fix typo in branch 2020-03-27 23:44:17 +01:00
NotMyFault
4bcd926543 Update discord links 2020-03-09 23:50:22 +01:00
Alexander Söderberg
05626c2c8f
Features/v5/move swap fixes + some other important commits (comments, etc) (#2699)
* Use generics instead of the raw class

* Add Gradle wrapper verification

* Fix biome setting in versions prior to 1.15

* Fixes #2654

* Document area getters in PlotAreaManager, and replace y-value with z in the area contains check.

* Remove update notifications

* Remove unused dependencies

* Do not kick plot owners on "/p deny *"

* Do not kick any added players on /p deny *

* Allow redstone to be used in server plot with `redstone.disable-offline` enabled.

Potentially fixes #2613

* Disallow swapping ,erged plots

* Fix legacy converter.

* Fix blockbucket pattern generation

* Prevent pasting schematics onto merged plots.

* Cancel claim event correctly

* Revert "Cancel claim event correctly"

This reverts commit 0f786155
Further investigation required

* Fix plot swapping messing up owners. Fixes #2282

* Fix plot move

* Prevent plot swapping form changing the database unless the swap was successful.

* Update signs after swap.

* Only send move success message if the move was successful.

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Daniel <admin@hywse.eu>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2020-02-28 22:15:04 +01:00
NotMyFault
5ea03f12fb
Update issue template 2020-02-14 17:54:45 +01:00
NotMyFault
edc81bc668
Updated branch names for gh actions testing 2020-01-21 15:52:57 +01:00
NotMyFault
dbd6feed4e Update issue template and add link to suggestion repo on issue tab 2019-12-14 18:05:15 +01:00
NotMyFault
480c9f11b8
Add 1.15 to templates 2019-12-14 17:46:07 +01:00
NotMyFault
6908b9f29b
Update bug-issue-report-for-plotsquared.md 2019-11-24 19:30:37 +01:00
NotMyFault
8b7e8ec635
Update bug-issue-report-for-plotsquared.md 2019-11-22 15:52:25 +01:00
NotMyFault
1a2c15684e
Fixed typo 2019-11-11 21:39:27 +01:00
NotMyFault
b02565532f
Update template checkbox 2019-11-11 21:38:44 +01:00
NotMyFault
7309e61221 AeSix' template improvements 2019-11-02 12:48:41 +01:00
NotMyFault
b074e6e198
Update auto-comment.yml
I created templates and setup Actions to ensure functionality.
2019-10-01 12:54:20 +02:00
NotMyFault
becac84e6e
Setup Actions test 2019-09-18 02:06:28 +02:00
NotMyFault
758c343e52
Update bug-issue-report-for-plotsquared.md 2019-09-08 20:25:12 +02:00
NotMyFault
04f789d404 Fix merging 2019-09-08 20:02:45 +02:00
NotMyFault
08cd39749b Create PULL_REQUEST_TEMPLATE.md 2019-08-27 14:44:56 +02:00
NotMyFault
3e8b8a7575 Remove old files 2019-08-05 14:03:08 -04:00