Rebase fixes.

This commit is contained in:
Sam 2021-12-21 16:17:11 -05:00
parent 360e12be22
commit 1c0154487a

View File

@ -296,6 +296,14 @@
],
craft_sprite: Some(Forge),
),
// Only for Christmas event so remove once done
"diamonds": (
output: ("common.items.mineral.gem.diamond", 1),
inputs: [
(Item("common.items.mineral.ore.coal"), 20, false),
],
craft_sprite: Some(Forge),
),
"cotton": (
output: ("common.items.crafting_ing.cloth.cotton", 1),
inputs: [