Skip to content
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

Nested Recipes - Ropes, Bundles, Shelled Nuts #60297

Merged
merged 7 commits into from
Aug 19, 2022

Conversation

ANickelN
Copy link
Contributor

Summary

Interface "Nested Recipes - Ropes, Bundles, Shelled Nuts"

Purpose of change

Same as usual, nest annoying things.

Describe the solution

Add necessary JSON.

Describe alternatives you've considered

Going back in time and convincing myself not to do this.

Testing

cataclysm-tiles_dcYavISn3h
Just an example, I tested all of the additions.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 19, 2022
@bombasticSlacks bombasticSlacks merged commit 0ba9a3a into CleverRaven:master Aug 19, 2022
@ANickelN ANickelN deleted the nestedbundles branch August 19, 2022 22:05
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Aug 21, 2022
* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
* Hide Bundle of "X" Recipes

* Nested Recipes Bundle of Items

* Hide Shelled Nut Recipes

* Nested Recipe Shelled Nuts

* Hide Cord/Rope Recipes

* Nest Rope PT1

* Nested Rope Recipes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants