-
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.
added soybean oil. reduced oil requirement for pizza
- Loading branch information
1 parent
73a967b
commit 9476858
Showing
32 changed files
with
197 additions
and
10 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
### Changes | ||
- Added Stainless Steel jar lids | ||
- Added Stainless Steel jar lids. | ||
- Updated the stomping barrel recipe again. | ||
- Made the check for flowers for bees much more forgiving, most plants should work now. | ||
- Made the check for flowers for bees much more forgiving, most plants should work now. | ||
- Reduced the oil requirement for pizzas to 100 mB. | ||
- Added soybean oil. It burns slightly less efficiently than olive oil in a lamp, and may be substituted for olive oil in pizza. |
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/soybean_oil.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/soybean_oil" | ||
} | ||
} | ||
} |
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/soybean_oil.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/soybean_oil.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:fluid_container", | ||
"parent": "forge:item/bucket", | ||
"fluid": "firmalife:soybean_oil" | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/resources/assets/firmalife/models/item/food/dehydrated_soybeans.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,7 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"parent": "item/generated", | ||
"textures": { | ||
"layer0": "firmalife:item/food/dehydrated_soybeans" | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/resources/assets/firmalife/models/item/food/soybean_paste.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,7 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"parent": "item/generated", | ||
"textures": { | ||
"layer0": "firmalife:item/food/soybean_paste" | ||
} | ||
} |
Binary file added
BIN
+602 Bytes
src/main/resources/assets/firmalife/textures/block/dehydrated_soybeans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+263 Bytes
src/main/resources/assets/firmalife/textures/block/soybean_paste.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+579 Bytes
src/main/resources/assets/firmalife/textures/item/food/dehydrated_soybeans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+380 Bytes
src/main/resources/assets/firmalife/textures/item/food/soybean_paste.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions
18
src/main/resources/data/firmalife/recipes/barrel/soybean_oil.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,18 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "tfc:barrel_sealed", | ||
"input_item": { | ||
"ingredient": { | ||
"item": "firmalife:food/soybean_paste" | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "minecraft:water", | ||
"amount": 100 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:soybean_oil", | ||
"amount": 250 | ||
}, | ||
"duration": 24000 | ||
} |
18 changes: 18 additions & 0 deletions
18
src/main/resources/data/firmalife/recipes/drying/dehydrated_soybeans.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,18 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:drying", | ||
"ingredient": { | ||
"type": "tfc:not_rotten", | ||
"ingredient": { | ||
"item": "tfc:food/soybean" | ||
} | ||
}, | ||
"result": { | ||
"stack": { | ||
"item": "firmalife:food/dehydrated_soybeans" | ||
}, | ||
"modifiers": [ | ||
"tfc:copy_food" | ||
] | ||
} | ||
} |
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
18 changes: 18 additions & 0 deletions
18
src/main/resources/data/firmalife/recipes/quern/soybean_paste.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,18 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "tfc:quern", | ||
"ingredient": { | ||
"type": "tfc:not_rotten", | ||
"ingredient": { | ||
"item": "firmalife:food/dehydrated_soybeans" | ||
} | ||
}, | ||
"result": { | ||
"stack": { | ||
"item": "firmalife:food/soybean_paste" | ||
}, | ||
"modifiers": [ | ||
"tfc:copy_food" | ||
] | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
src/main/resources/data/firmalife/recipes/stomping/soybean_paste.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,16 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:stomping", | ||
"ingredient": { | ||
"type": "tfc:not_rotten", | ||
"ingredient": { | ||
"item": "firmalife:food/dehydrated_soybeans" | ||
} | ||
}, | ||
"result": { | ||
"item": "firmalife:food/soybean_paste" | ||
}, | ||
"input_texture": "firmalife:block/dehydrated_soybeans", | ||
"output_texture": "firmalife:block/soybean_paste", | ||
"sound": "minecraft:entity.slime.squish" | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"replace": false, | ||
"values": [ | ||
"firmalife:soybean_oil", | ||
"tfc:olive_oil" | ||
] | ||
} |
8 changes: 8 additions & 0 deletions
8
src/main/resources/data/firmalife/tags/fluids/soybean_oil.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", | ||
"replace": false, | ||
"values": [ | ||
"firmalife:soybean_oil", | ||
"firmalife:flowing_soybean_oil" | ||
] | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/resources/data/firmalife/tfc/food_items/dehydrated_soybeans.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,10 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"ingredient": { | ||
"item": "firmalife:food/dehydrated_soybeans" | ||
}, | ||
"category": "other", | ||
"hunger": 4, | ||
"saturation": 0, | ||
"decay_modifier": 0.5 | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/resources/data/firmalife/tfc/food_items/soybean_paste.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,10 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"ingredient": { | ||
"item": "firmalife:food/soybean_paste" | ||
}, | ||
"category": "other", | ||
"hunger": 4, | ||
"saturation": 0, | ||
"decay_modifier": 0.6 | ||
} |
9 changes: 9 additions & 0 deletions
9
src/main/resources/data/firmalife/tfc/lamp_fuels/soybean_oil.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,9 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"fluid": "firmalife:soybean_oil", | ||
"burn_rate": 7000, | ||
"valid_lamps": { | ||
"type": "tfc:tag", | ||
"tag": "tfc:lamps" | ||
} | ||
} |
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
Oops, something went wrong.