-
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.
- Fix ingot and sheet textures missing
- Add vat recipes for tfc fruits - Fix hollow shells deleting blocks they shouldn't when placing - Hopefully fix IWeatherable crash - Fix toast with jam recipe
- Loading branch information
1 parent
2649a1d
commit f43e743
Showing
33 changed files
with
548 additions
and
13 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,9 @@ | ||
|
||
### Fixes | ||
|
||
- Temporarily rolled back the sherd changes as they are crashing the mod on load. You can still obtain sherds via crafting. | ||
- Fix ingot and sheet textures missing for Firmalife metals. | ||
- Add vat recipes for TFC fruits. | ||
- Fix hollow shells deleting blocks they shouldn't when placing. | ||
- Attempt to fix a crash related to greenhouse blocks. | ||
- Fix toast with jam recipe not being usable. | ||
- Update some textures, thanks to Lexal for these |
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
Binary file added
BIN
+737 Bytes
src/main/resources/assets/firmalife/textures/block/metal/smooth/chromium.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
+753 Bytes
...main/resources/assets/firmalife/textures/block/metal/smooth/stainless_steel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/banana_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/banana" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/banana" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/blackberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/blackberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/blackberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/blueberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/blueberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/blueberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/bunchberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/bunchberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/bunchberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/cherry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/cherry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/cherry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/cloudberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/cloudberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/cloudberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/cranberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/cranberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/cranberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/elderberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/elderberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/elderberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/gooseberry_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/gooseberry" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/gooseberry" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/green_apple_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/green_apple" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/green_apple" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/data/firmalife/recipes/vat/lemon_jar.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,24 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "firmalife:vat", | ||
"input_item": { | ||
"ingredient": { | ||
"type": "tfc:lacks_trait", | ||
"trait": "firmalife:dried", | ||
"ingredient": { | ||
"item": "tfc:food/lemon" | ||
} | ||
} | ||
}, | ||
"input_fluid": { | ||
"ingredient": "firmalife:sugar_water", | ||
"amount": 500 | ||
}, | ||
"output_fluid": { | ||
"fluid": "firmalife:fruity_fluid", | ||
"amount": 500 | ||
}, | ||
"jar": { | ||
"item": "tfc:jar/lemon" | ||
} | ||
} |
Oops, something went wrong.