mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-17 11:15:07 +00:00
Merge remote-tracking branch 'origin/Cricket' into dev
Conflicts: src/main/java/com/cricketcraft/chisel/Chisel.java src/main/java/com/cricketcraft/chisel/Features.java src/main/java/com/cricketcraft/chisel/config/Configurations.java src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
This commit is contained in:
commit
bf4ce506e5
11 files changed
+282
-389
No files matched your search
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user