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

Gunmod modern json #38096

Merged
merged 4 commits into from
Feb 17, 2020
Merged

Gunmod modern json #38096

merged 4 commits into from
Feb 17, 2020

Conversation

snipercup
Copy link
Contributor

Summary

SUMMARY: none

Purpose of change

Contributes to #36610 and #36110

Describe the solution

Change name to object
Change volume to string
change integral_volume to string
Ammo_modifier to array

Describe alternatives you've considered

Not changing

Testing

image
image
image

@ZhilkinSerg ZhilkinSerg added the [JSON] Changes (can be) made in JSON label Feb 17, 2020
@ZhilkinSerg ZhilkinSerg merged commit 8ce5e61 into CleverRaven:master Feb 17, 2020
@snipercup snipercup deleted the Gunmod-modern-json branch February 17, 2020 17:17
@int-ua
Copy link
Contributor

int-ua commented Feb 17, 2020

@snipercup Just a heads-up: our changes may conflict, I suggest you subscribe to #38088 to avoid merging manually later if it gets merged soon.

@ZhilkinSerg
Copy link
Contributor

Don't worry - we can usually resolve conflicts when merging.

@snipercup
Copy link
Contributor Author

@int-ua okay thanks for the heads up

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants