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.

Sign up for GitHub

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

Jump to bottom

Armor name to object #38669

Merged
merged 1 commit into from
Mar 10, 2020
Merged

Armor name to object #38669

merged 1 commit into from
Mar 10, 2020

Conversation

snipercup
Copy link
Contributor

@snipercup snipercup commented Mar 9, 2020 •
edited
Loading

Summary

SUMMARY: none

Purpose of change

Contributes to #36110 and #36611

Describe the solution

Change name to object
fix repairs_like
Volume to string and add volume

Describe alternatives you've considered

Not changing

Testing

image
image
image

@ZhilkinSerg ZhilkinSerg added the [JSON] Changes (can be) made in JSON label Mar 9, 2020
@snipercup
Copy link
Contributor Author

Travis complains:

/bin/sh: 2: Syntax error: Unterminated quoted string
Makefile:1103: recipe for target 'json_formatter' failed
make: *** [json_formatter] Error 2

I'm not sure why it fails, the json is valid and I think the travis error is not caused by my pr.

@ZhilkinSerg ZhilkinSerg merged commit e04ecb9 into CleverRaven:master Mar 10, 2020
@snipercup snipercup deleted the Armor-name-to-object branch March 10, 2020 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@snipercup @ZhilkinSerg