Merge branch 'refs/heads/dev' into book-splitting

# Conflicts:
#	src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java
#	src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java
#	src/main/java/net/knarcraft/blacksmith/formatting/BlacksmithStringFormatter.java
#	src/main/java/net/knarcraft/blacksmith/trait/SalvageSession.java
#	src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java
This commit is contained in:
2025-09-06 15:09:34 +02:00
23 changed files with 187 additions and 653 deletions

View File

@@ -83,7 +83,7 @@
<dependency>
<groupId>net.knarcraft</groupId>
<artifactId>knarlib</artifactId>
<version>1.2.7</version>
<version>1.2.14</version>
<scope>compile</scope>
</dependency>
<dependency>