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

Merge pull request CleverRaven#37839 from jbytheway/mapgen_fix_missin… #85

Merged
merged 24 commits into from
Feb 16, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

jbytheway and others added 24 commits February 9, 2020 06:35
* Mention cddatags in the JSON docs

* Strip platform-specific path separator for tags

This is fixing a hypothetical bug which I think cddatags would have
suffered from on Windows (but untested there).

* Use cddatags in Makefile

There were already two rules for creating tags; update them both.

* Move some cddatags docs to DEVELOPER_TOOLING

The second paragraph was not useful to non-code-writing contributors, so
move it and rewrite it.

* cddatags: Force UTF-8 encoding for json files

* Expand on the cddatags docs

Thanks to snipercup for researching useful tips for Windows.
Armor Name to object, volume to string
Armor name to object, fix looks_like, volume to string
* Lower time needed for hard_tack recipe.

* Raise time for recipe from 45 min to 75 min.
Minireactor powered vehicles haven't fit in canon fore a while, so they
shouldn't be spawning.
Have them spawn in Aftershock instead.
@fengjixuchui fengjixuchui merged commit 7608a2f into fengjixuchui:master Feb 16, 2020
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.

8 participants