Merged
Conversation
Member
Author
|
Almost forgot - need to add locale for the default fluid recipes before merge. |
Co-authored-by: HurricaneFUE5 <rzeifart@gmail.com>
Co-authored-by: HurricaneFUE5 <rzeifart@gmail.com>
Danielv123
force-pushed
the
space-age-update
branch
from
6f571a1 to
6b4728b
Compare
Danielv123
force-pushed
the
space-age-update
branch
from
41d2b35 to
5944a32
Compare
Co-authored-by: HurricaneFUE5 <rzeifart@gmail.com>
Danielv123
force-pushed
the
space-age-update
branch
from
5944a32 to
b6cba8c
Compare
Member
Author
|
|
build.js
Outdated
Comment on lines
+274
to
+276
| (async () => { | ||
| await main().catch(err => { console.log(err) }); | ||
| })(); |
Member
There was a problem hiding this comment.
What does this async warp achieve?
Member
Author
There was a problem hiding this comment.
Remnant from extra tooling I run in my local environment, i could revert it but the diff is cleaner like this
| @@ -1,9 +1,8 @@ | |||
| -- Auto generated by post.py, do not edit | |||
Member
There was a problem hiding this comment.
Is this file no longer generated by post.py? I do not see any changes to that file.
Member
Author
There was a problem hiding this comment.
Yeah, blender render is gone, I should remove it.
Member
|
Two issues found by manual testing.
|
Danielv123
force-pushed
the
space-age-update
branch
from
cf3b527 to
2064b0b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds compatibility with space age while maintaining compatibility with 0.17, 1.0 and 1.1
The control stage now uses the new compat function from clusterio_lib. I changed the versioning scheme from 1.99.???+1/2 to 2.minor.factorio_version. This makes it a lot easier to tell which version belongs to which factorio version.