Whipped cream and frosting requirements #48067
Merged
Conversation
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
Update my fork
Post 0.E merge fest
Update fork
Update repo
Update to pockets
Update my Fork
catchup to mainline
August 1 2020 Catchup to Master
Catchup for Artifact conversions
include updated relics
Let's talk relics
catch a mouse
make it up to date
interesting
catchup branch
This reverts commit 9da0eae.
ZhilkinSerg
force-pushed
the
0.F-dev
branch
3 times, most recently
from
11f8b39 to
a3ed94b
Compare
ZhilkinSerg
force-pushed
the
0.F-dev
branch
3 times, most recently
from
ac1984a to
c8f13cf
Compare
Maleclypse
force-pushed
the
whipped-cream-and-frosting-requirements
branch
from
bfdce47 to
23ffe78
Compare
remove aerosol whip cream frosting requirement Update slings.json Update data/json/recipes/recipe_food.json Update data/json/items/comestibles/dairy.json Revert "remove aerosol whip cream" This reverts commit b8570f6. Update misc.json Delete recipe_obsolete.json Delete misc.json Delete slings.json Delete ammo_types.json Delete enchantments.json Revert "Delete recipe_obsolete.json" This reverts commit 3119fdc. Revert "Delete misc.json" This reverts commit 71b811b. Revert "Delete ammo_types.json" This reverts commit 848c739. Revert "Delete slings.json" This reverts commit 7c91194. fixes Co-Authored-By: actual-nh <[email protected]> Co-Authored-By: casswedson <[email protected]>
Maleclypse
force-pushed
the
whipped-cream-and-frosting-requirements
branch
from
69036a4 to
0128f90
Compare
Maleclypse
changed the title
actual-nh
reviewed
Jul 6, 2021
There was a problem hiding this comment.
Nice! Should perhaps give ideas for My Sweet Cataclysm (@Fris0uman? Still need to go over the faction relationships for it, BTW.)
Co-authored-by: actual-nh <[email protected]>
…hub.com/Maleclypse/Cataclysm-DDA into whipped-cream-and-frosting-requirements
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Content "Adds Whipped cream and any_frosting requirement"
Purpose of change
Add's additional use for heavy cream and makes it interchangeable with buttercream.
Describe the solution
Add's whipped cream, recipe for it and requirements to use it. Corrects cake and homemade toaster pastry to use new any_frosting requirement.
Describe alternatives you've considered
Are there any other recipes that should be adjusted to include frosting? Are there any additional recipes that should be created to use frosting?
Testing
TBD
Additional context