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

Tools.json sorting pt. 2 #37213

Merged
merged 4 commits into from
Jan 19, 2020

Conversation

RarkGrames
Copy link
Contributor

Summary

SUMMARY: Infrastructure "Sorted out tools.json into several category files"

Purpose of change

Sorting out tools.json into separate category files in json\items\tool for easier handling.
Continuation of #37212.

Describe the solution

  • Doing deployable.json, electronics.json and entry_tools.json

Testing

Game loads properly. Double check every item to be sure.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Jan 19, 2020
@ZhilkinSerg
Copy link
Contributor

You would probably need to resolve conflicts each time one of these PR is merged.

@RarkGrames
Copy link
Contributor Author

Yes, I will do that.

@RarkGrames
Copy link
Contributor Author

Handled the merge conflicts.

@ZhilkinSerg ZhilkinSerg merged commit 82d31e9 into CleverRaven:master Jan 19, 2020
@RarkGrames RarkGrames deleted the Tools.json-sorting-pt.-2 branch January 21, 2020 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants