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

Restore millability of cattail rhizomes which was accidentally removed some time ago #55814

Conversation

DanielVartanov
Copy link
Contributor

@DanielVartanov DanielVartanov commented Mar 4, 2022

Summary

Bugfixes "Restore millability of cattail rhizomes which was accidentally removed some time ago"

Purpose of change

Ability to mill cattail rhizomes in a windmill/watermill was removed in a commit which seems totally unrelated: 1d04305
I believe it was done totally by accident.
Which resulted in an unfortunate inability to mill rhizomes anyhow but in a quern via a recipe.

Describe the solution

A correspondent JSON key was restored.

Additional context

A full story of cattail rhizomes millability:

#48162 made cattail rhizomes millable
#47881 duplicated millability in cattail rhizome's JSON
#49569 reported the erroneous duplication
#49562 removed the duplication
1d04305 completely removed millability from cattail rhizome's JSON, allegedly by accident
#55814 (this PR) restores cattail rhizomes millability

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 4, 2022
@Maleclypse Maleclypse added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON labels Mar 4, 2022
@Qrox
Copy link
Contributor

Qrox commented Mar 5, 2022

So, #49562 and 1d04305 each removed a different duplicated entry, which after merging resulted in the total removal of the entry. Shows auto-merging can be unreliable at times.

@Rivet-the-Zombie Rivet-the-Zombie merged commit bd61d70 into CleverRaven:master Mar 5, 2022
Arokha pushed a commit to Arokha/Cataclysm-DDA that referenced this pull request Mar 6, 2022
…hizome-milling

Restore millability of cattail rhizomes which was accidentally removed some time ago
Arokha pushed a commit to Arokha/Cataclysm-DDA that referenced this pull request Mar 6, 2022
…hizome-milling

Restore millability of cattail rhizomes which was accidentally removed some time ago
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 <Bugfix> This is a fix for a bug (or closes open issue) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [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.

4 participants