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:
Reference in New Issue
Block a user