-
Notifications
You must be signed in to change notification settings - Fork 280
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(content): fruit products (jam, juice, cooked) will inherit name from component used #4737
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to check and confirm that yes, sweet_fruit_fresh
and sweet_fruit_irradiated
do indeed contain orange and cranberry, or else this PR would've needed that fixed. Looks good, just is a big-ass bunch of changes to sift through.
I wish component names could be an array though, so that you could condense the fresh and irradiated names into a single line, I assume that's not an option currently though.
I had the problem with peanut butter in my other PR, that lead to with butter, when using peanut butter. Maybe I can cut it down a bit. And yes, orange and cranberry are in it. |
yea, irritated can be cut out. I will correct it now, don't merge it yet |
sadly wine is also not working. Due vat transformation. Pulp is a byproduct, doesn't inherit anything. Comment fix Update drink.json extra names Update recipes.json Update recipes.json Update egg.json fixes and completion
Vat transformation does kill the fruit wine changes. |
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
…into jam-fruit
I am done, no more changes |
Purpose of change
Fruit jams, juices, pies, waffles, milkshakes, fruit slices, cookies, kompot, granola canned fruit and cooked fruit will now use the corresponding name of what it is made from.
If juice is made from apples it will be apple juice.
If jam is made from oranges, it will be orange jam.
Orange juice (oj) recipes and cranberry juice recipes got obsoleted due to being covered by the juice crafting.
the items themselves didn't get obsoleted. So dedicated cranberry or orange juice can still spawn.
(and egg names got corrected)
Describe the solution
Describe alternatives you've considered
Testing
Additional context
Checklist