-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- allow flatbread/slices in sandwiches (Closes #87)
- add hot chocolate - fix chromite item size again - fix food age enum not having translation - allow tofu in burritos/tacos - fix milking not working due to tfc update (Closes #116) - fix broken collapse recipes for chromite ore - refactor chocolate item tag to foods/chocolate instead of food/chocolate - fix firmalife doors fitting in chests
- Loading branch information
1 parent
4e3b870
commit 75d845f
Showing
53 changed files
with
1,061 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/main/resources/assets/firmalife/blockstates/fluid/chocolate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"variants": { | ||
"": { | ||
"model": "firmalife:block/fluid/chocolate" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/firmalife/models/block/fluid/chocolate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"textures": { | ||
"particle": "minecraft:block/water_still" | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/firmalife/models/item/bucket/chocolate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"loader": "forge:bucket", | ||
"parent": "forge:item/bucket", | ||
"fluid": "firmalife:chocolate" | ||
} |
35 changes: 35 additions & 0 deletions
35
src/main/resources/data/firmalife/advancements/crafting/barley_flatbread_sandwich.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_item": { | ||
"trigger": "minecraft:inventory_changed", | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"tfc:food/barley_bread" | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"has_the_recipe": { | ||
"trigger": "minecraft:recipe_unlocked", | ||
"conditions": { | ||
"recipe": "firmalife:crafting/barley_flatbread_sandwich" | ||
} | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_item", | ||
"has_the_recipe" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"firmalife:crafting/barley_flatbread_sandwich" | ||
] | ||
} | ||
} |
35 changes: 35 additions & 0 deletions
35
src/main/resources/data/firmalife/advancements/crafting/barley_slice_sandwich.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_item": { | ||
"trigger": "minecraft:inventory_changed", | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"tfc:food/barley_bread" | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"has_the_recipe": { | ||
"trigger": "minecraft:recipe_unlocked", | ||
"conditions": { | ||
"recipe": "firmalife:crafting/barley_slice_sandwich" | ||
} | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_item", | ||
"has_the_recipe" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"firmalife:crafting/barley_slice_sandwich" | ||
] | ||
} | ||
} |
35 changes: 35 additions & 0 deletions
35
src/main/resources/data/firmalife/advancements/crafting/maize_flatbread_sandwich.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_item": { | ||
"trigger": "minecraft:inventory_changed", | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"tfc:food/maize_bread" | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"has_the_recipe": { | ||
"trigger": "minecraft:recipe_unlocked", | ||
"conditions": { | ||
"recipe": "firmalife:crafting/maize_flatbread_sandwich" | ||
} | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_item", | ||
"has_the_recipe" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"firmalife:crafting/maize_flatbread_sandwich" | ||
] | ||
} | ||
} |
Oops, something went wrong.