Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-27 04:12:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,274 Commits 12 Branches 67 Tags 87 MiB
444ccda807
Commit Graph

45 Commits

Author SHA1 Message Date
Alexander Brandes
444ccda807
Add support for 1.20 (#4061) 
1.20 fixes
 2023-06-09 13:22:55 +02: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
Jordan
39d2f1a72c
chore: remove uses of deprecated Permissions class and add javadoc notes (#3930) 
- Closes #3907
 2023-01-15 14:08:59 +01:00
dordsor21
c83b13e374
Merge branch 'v6' into v7 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/command/Chat.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegExUtil.java
#	build.gradle.kts
#	gradle/libs.versions.toml
 2022-06-16 15:25:33 +01:00
Alexander Brandes
3d5c694daa
chore: Comply with OSSRH licensing guidelines (#3684) 2022-06-15 20:17:17 +02:00
Alexander Brandes
c93b08d0c7
feat: Add 1.19 music disk to the /plot music GUI (#3668) 
feat: Add 1.19 music disk to the GUI
 2022-06-12 10:47:00 +02:00
Pierre Maurice Schwang
62ee60a76c
Update MiniMessage to 4.10.1 (#3617) 
* chore!: bump MiniMessage to 4.10.1

BREAKING CHANGE: bumping MiniMessage and Adventure removes the adventure Template class and breaks the whole messaging system api wise

* chore: fix minimessage messages, fix circular method reference
 2022-05-14 17:05:28 +02:00
Pierre Maurice Schwang
543284e016
fix: NPE on unavailable music discs on lower versions (#3475) 
* fix: NPE on unavailable music discs

* chore: documentation for InventoryUtil changes

* fix: no need for additional decrement

* chore: address requested changes

* fix: prevent binary mismatch

Co-authored-by: Alex <mc.cache@web.de>
 2022-02-04 18:21:43 +01:00
Hannes Greule
d06a827e31
Always call plot events through the event dispatcher (#3479) 2022-01-29 13:12:00 +01:00
Alex
bcfe7c58dd
feat: Add 1.18's music disc additions to /plot music (#3446) 2022-01-12 22:22:01 +01:00
Alex
8f7c2e4c02
fix: /plot music being able to be used on unclaimed plots (#3432) 2022-01-11 11:01:36 +01:00
NotMyFault
25095f4546
chore: Welcome 2022 2022-01-02 22:22:19 +01:00
Alex
47ae79e123
Revert "refactor: Address MiniMessage deprecations (#3354)" (#3371) 
This reverts commit f086826942.
 2021-12-14 23:04:36 +01:00
Alex
f086826942
refactor: Address MiniMessage deprecations (#3354) 
* refactor: Address MiniMessage deprecations

* refactor: More MiniMessage deprecations

* Move away from our `Templates#of`

* Address comments

* style: Address migration style issues

* docs: Add javadoc link for MiniMessage
 2021-12-13 09:48:34 +01:00
NotMyFault
2988ad6b11
Address style violations 2021-08-18 11:58:18 +02:00
NotMyFault
6d71e0f8be
Fixes 3168 2021-07-20 22:21:32 +02:00
NotMyFault
e97bc25fb8
Log plot chat to console 
- Fix plot music removal template
- Fix debug args
 2021-05-17 10:35:09 +02:00
NotMyFault
3d7c191d1c
Make the plot jukebox gui translatable 
Fixes https://github.com/IntellectualSites/PlotSquared-Translations/issues/2
 2021-05-13 20:21:19 +02:00
NotMyFault
600d38d3e2
Add flag placeholders to flag commands 2021-04-02 17:50:37 +02:00
Hannes Greule
38b60205e8 Use javax for Nullable + guice, hope I didn't miss anything 2021-02-24 20:35:38 +01:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
N0tMyFaultOG
e8642df674
Update licenses to 2021 
Happy new year 🎆
 2021-01-01 00:19:45 +01:00
N0tMyFaultOG
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
N0tMyFaultOG
aefa629509 Generify permissions thru Permission class 
- Fixed a few improper permissions
- Fixed a couple of typos
 2020-11-02 00:55:58 +01: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
Mariell Hoversholm
c3069a425d Format licence headers 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
Hannes Greule
55211907f2 Use command descriptions from translations 2020-08-20 23:16:15 +02:00
N0tMyFaultOG
fabb9b6fd7 More json stuff 2020-08-17 18:15:29 +02:00
Hannes Greule
4789327378 Encapsulate fields 2020-08-17 15:17:40 +02:00
N0tMyFaultOG
c6a368d6f2 More json fixes 2020-08-17 13:24:15 +02:00
N0tMyFaultOG
e9efa3f2d3 Fix some translation issues 2020-08-16 18:24:54 +02:00
N0tMyFaultOG
4a220f9bfb Update license header 2020-08-15 14:59:29 +02:00
N0tMyFaultOG
32e095ce15 More progress 
I need a break, if something is missing, feel free to exchange that. K thx 🙏
 2020-07-22 19:42:22 +02:00
Hannes Greule
7e0cdb12d7 Replace some common messages 2020-07-18 15:06:51 +02:00
Alexander Söderberg
33b6ef66d6 Delombok + import organisation 2020-07-17 17:24:45 +02:00
Alexander Söderberg
510ea56431
Finalize DI stuff 2020-07-14 18:49:40 +02:00
Alexander Söderberg
916675fb08
Guice progress 2020-07-11 17:19:19 +02:00
Alexander Söderberg
6442922d86 Implement some more generic types to make the player objects easier to work with and also create wrapper objects for fake players (NPCs). Potentially fixes PS-27 2020-05-27 14:08:48 +02:00
dordsor21
42106bb97a I didn't get everything first time 2020-04-30 11:33:59 +01:00
Alexander Söderberg
ee2ed8222d
Merge config packages 2020-04-16 06:14:33 +02:00
Alexander Söderberg
6f052f0001
Remove extra line from HEADER 2020-04-16 05:05:58 +02:00
Alexander Söderberg
ba40a56c32
Add GPLv3 License headers to all source files. 2020-04-16 04:52:39 +02:00
MattBDev
780be3776a Addressed some comments 2020-04-15 15:26:54 -04:00