Commit Graph

52 Commits

Author SHA1 Message Date
Alexander Brandes
8e02336c44
Reapply stash 2023-03-15 10:30:38 +01:00
Alexander Brandes
e6db8e2750
Perform code formatting according to editorconfig (#3981)
* Perform code reformatting

* Fix javadoc errors
2023-03-06 11:38:30 +01:00
Alexander Brandes
d455d1fcd7
Merge branch 'v6' into v7 2023-03-06 10:48:51 +01:00
Alexander Brandes
a5fdcda673
Merge branch 'v6' into v7 2023-03-05 10:18:55 +01:00
renovate[bot]
52823f5024
Update Ilshidur/action-discord digest to 08d9328 (#3974)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-05 10:15:38 +01:00
Alexander Brandes
785362c576
Merge branch 'v6' into v7 2023-03-02 12:34:18 +01:00
Alexander Brandes
e98f628d34
Pin GH actions to SHA to avoid mutable refs (#3973) 2023-03-02 12:30:14 +01:00
dordsor21
6efd581500
Merge branch 'v6' into v7
# Conflicts:
#	.github/workflows/codeql.yml
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Caps.java
#	Core/src/main/java/com/plotsquared/core/command/Cluster.java
#	Core/src/main/java/com/plotsquared/core/command/Continue.java
#	Core/src/main/java/com/plotsquared/core/command/Copy.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	build.gradle.kts
2023-01-17 11:51:39 +00:00
Alexander Brandes
c978322036
Separate workflows between PRs and pushes (#3928)
* Separate workflows between PRs and pushes

* Fixup
2023-01-15 14:10:41 +01:00
Alexander Brandes
febac6fa40
Release 6.10.8 2023-01-09 15:43:51 +01:00
Alexander Brandes
02ae14894a
Stage 6.10.7 2023-01-09 15:23:50 +01:00
Alexander Brandes
350eae7813
Temporarily create javadocs for v7 snapshots 2023-01-09 11:35:11 +01:00
Alexander Brandes
12dc198a86
Temporarily create javadocs for v7 snapshots 2023-01-09 11:33:49 +01:00
Alexander Brandes
fb2533d66a
Start deployment of v7 snapshots 2023-01-09 10:42:08 +01:00
Alexander Brandes
7135bdd6aa
Fix compile errors 2023-01-08 10:36:41 +01:00
Alexander Brandes
3effaefda7
chore: Announce releases on Discord (#3839) 2022-10-09 16:40:51 +02:00
Alexander Brandes
7279862def
docs: Publish javadocs to GH actions (#3686)
* docs: Publish javadocs to GH actions

* chore: Use updated URL

* chore: Use correct URL
2022-06-17 23:40:29 +02:00
renovate[bot]
dc2d08c67e
build: Update release-drafter/release-drafter action to v5.20.0 (#3624)
* build: Update release-drafter/release-drafter action to v5.20.0

* Update release-drafter.yml

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
2022-05-18 17:19:23 +02:00
renovate[bot]
8982b33b6c
build: Update github/codeql-action action to v2 (#3589)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-04-25 15:59:30 +02:00
renovate[bot]
c4aa497a2b
build: Update actions/setup-java action to v3.1.0 (#3563)
* build: Update actions/setup-java action to v3.1.0

* Update build.yml

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
2022-04-04 15:31:53 +02:00
NotMyFault
5e188d114f
build: Misc dependency updates 2022-03-08 20:50:19 +01:00
renovate[bot]
b46f486680
build: Update actions/checkout action to v3 (#3530)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-03-07 23:14:24 +01:00
NotMyFault
dc13f2565f
ci: Pin GH workflow dependencies 2022-03-07 15:26:41 +01:00
Alex
05e055e9cf
ci: Bump actions/setup-java to 3.0.0 (#3519) 2022-02-25 22:43:24 +01:00
NotMyFault
78b8696778
refactor: Delete rebase.yml 2022-02-23 10:54:07 +01:00
renovate[bot]
fff14b05cb
build: Update release-drafter/release-drafter action to v5.18.1 (#3494)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-02-07 10:37:26 +01:00
NotMyFault
0d78ba5f35
[ci skip] ci: Don't run actions twice 2022-01-31 21:12:00 +01:00
renovate[bot]
6a5859ee0f
build: Update release-drafter/release-drafter action to v5.17.6 (#3467)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-01-24 11:06:27 +01:00
renovate[bot]
74a490f9f0
build: Update release-drafter/release-drafter action to v5.17.5 (#3460)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-01-17 11:19:28 +01:00
NotMyFault
07d0f124b4
ci: Let release drafter listen to forks too 2022-01-05 11:56:28 +01:00
Alex
8d6c621763
ci: Setup auto rebase (#3431) 2022-01-04 15:38:21 +01:00
renovate[bot]
2cf268b99c
build: Update actions/setup-java action to v2.5.0 (#3404)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-12-27 10:42:07 +01:00
renovate[bot]
76b58485a9
build: Update actions/checkout action to v2.4.0 (#3393)
* build: Update actions/checkout action to v2.4.0

* chore: Invert bolt's status

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-12-20 11:55:14 +01:00
NotMyFault
392ee9fa07
ci: Escape workflow tasks 2021-12-17 21:36:56 +01:00
NotMyFault
2a40f52dea
docs: Update issue template to 1.18 2021-12-05 23:29:28 +01:00
NotMyFault
d2776eed5a
[ci skip] Move to work level templates 2021-10-08 18:09:58 +02:00
NotMyFault
21727ebfc7
build: Overhaul build & deployment workflow (#3267)
* Fixes #3250

* build: Overhaul build & deployment workflow

- Move to release drafter
- Replace publishing with gradle nexus
- Conventional commits are handy
- Determine build status in gh actions before deploying
2021-10-04 15:28:47 +02:00
NotMyFault
2988ad6b11
Address style violations 2021-08-18 11:58:18 +02:00
NotMyFault
1dc225362d
Bump gh action tasks prevent failing of gradle wrapper validation 2021-06-02 23:29:43 +02:00
NotMyFault
58ad9db5ed
Jump to Java 16 2021-05-14 01:04:09 +02:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +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
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
NotMyFault
e72ce9c90e
Update gradle.yml 2020-07-14 12:44:11 +02:00
NotMyFault
a285404847 Update gradle, actions and fix typo in branch 2020-03-27 23:44:17 +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