Merge branch 'refs/heads/master' into develop-apiUtil

# Conflicts:
#	src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java
This commit is contained in:
2024-12-08 13:10:27 +01:00
5 changed files with 148 additions and 1 deletions

View File

@@ -69,4 +69,7 @@ packselect:
icon: "" # base64 player-head texture, can be obtained from sites like https://minecraft-heads.com/ under developers > Value
endPrevent:
endDisabled: true
endDisabled: true
feedback:
api: https://mhsl.eu/craftattack/api/feedback

View File

@@ -50,3 +50,5 @@ commands:
acInform:
infobar:
endPrevent:
feedback:
requestFeedback: