Compare commits

..

5 Commits

Author SHA1 Message Date
b36dab6301 fix: formatting of plot-title in placeholder 2025-07-20 22:55:27 +02:00
f020a6c6da feat: Added missing music_discs from 1.21.6 & 1.21.7 (#4694)
Added missing music_discs from 1.21.6 & 1.21.7
2025-07-14 21:50:08 +02:00
d7e158747e Fixes #4693
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-07-11 16:08:25 +02:00
4d64ea83ec Update dependency com.diffplug.spotless to v7.1.0 (#4692)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-08 03:47:44 +00:00
7ab334562c Back to snapshot for development
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-07-06 17:53:36 +02:00
5 changed files with 19 additions and 4 deletions

View File

@ -2,7 +2,8 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":semanticCommitsDisabled"
":semanticCommitsDisabled",
"schedule:earlyMondays"
],
"automerge": true,
"labels": [

View File

@ -57,7 +57,7 @@ public class Music extends SubCommand {
"music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
"music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
"music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
"music_disc_creator_music_box", "music_disc_precipice"
"music_disc_creator_music_box", "music_disc_precipice", "music_disc_tears", "music_disc_lava_chicken"
);
// make sure all discs and the bedrock ("cancel") fit into the inventory

View File

@ -63,4 +63,18 @@ public class PlotTitle {
return subtitle;
}
/**
* Provides a string representation of this plot title value (used in placeholders).
*
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
* @since TODO
*/
@Override
public String toString() {
return "\"%s\" \"%s\"".formatted(
this.title != null ? this.title : "",
this.subtitle != null ? this.subtitle : ""
);
}
}

View File

@ -22,7 +22,7 @@ plugins {
}
group = "com.intellectualsites.plotsquared"
version = "7.5.4"
version = "7.5.5-SNAPSHOT"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""

View File

@ -35,7 +35,7 @@ serverlib = "2.3.7"
# Gradle plugins
shadow = "8.3.8"
grgit = "4.1.1"
spotless = "7.0.4"
spotless = "7.1.0"
publish = "0.33.0"
runPaper = "2.3.1"