EpicKnarvik97 bb46967892 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

2025-09-06 15:09:34 +02:00

..

net/knarcraft/blacksmith

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

2025-09-06 15:09:34 +02:00