-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix recipe conflict between nahuatl shield core and obsidian plating
Casting obsidian either gives you a shield or a shield core based on which recipe won. Solved it by allowing nahuatl in the part builder and ditching composite for shield cores (all options are able to be made without composite)
- Loading branch information
1 parent
7bbb19f
commit 301f678
Showing
4 changed files
with
11 additions
and
9 deletions.
There are no files selected for viewing
5 changes: 0 additions & 5 deletions
5
...enerated/resources/data/tconstruct/recipes/tools/parts/casting/shield_core_composite.json
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/tconstruct/tinkering/materials/definition/nahuatl.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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"craftable": false, | ||
"craftable": true, | ||
"hidden": false, | ||
"sortOrder": 2, | ||
"tier": 3 | ||
|
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