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

Generic modern json #38004

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Generic modern json #38004

merged 2 commits into from
Feb 14, 2020

Conversation

snipercup
Copy link
Contributor

Summary

SUMMARY: none

Purpose of change

Contributes to #36110 and #36610

Describe the solution

Change name to object
remove name_plural
change volume to string and add some volume

Describe alternatives you've considered

Not changing

Testing

image
image
image

@I-am-Erk I-am-Erk merged commit 6c50a8c into CleverRaven:master Feb 14, 2020
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request Feb 14, 2020
@snipercup snipercup deleted the Generic-modern-json branch February 14, 2020 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants