Skip to content

Conversation

@danbopes
Copy link

@danbopes danbopes commented May 13, 2025

Upgrade Blueprint classes to support new logistic filter sections
Fix issue when trying to export blueprint with modules. closes #471
Support for new burner fuel inventory
Blueprints will now be exported with burner fuel inventory set (Default enabled, but can be disabled in preferences)

@danbopes danbopes requested a review from shpaass as a code owner May 13, 2025 18:24
Copy link
Collaborator

@veger veger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome to YAFC-CE, thank you for your contribution!

I am no blueprint expert (no idea how they are formatted/work), but the rest looks fine to me.

Copy link
Collaborator

@DaleStan DaleStan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content of the changes looks good, but it looks to me like you changed several files from exclusively CRLF line endings to a mix of CRLF and LF line endings.

I suspect this is due to your setting for core.autocrlf; I have it set to true

@danbopes
Copy link
Author

The content of the changes looks good, but it looks to me like you changed several files from exclusively CRLF line endings to a mix of CRLF and LF line endings.

I suspect this is due to your setting for core.autocrlf; I have it set to true

I thought I had accounted for all of the line ending misshapes, I'll fix in a bit

@shpaass
Copy link
Owner

shpaass commented May 14, 2025

Merge branch 'shpaass:master' into master

I advise to use rebasing in the future instead of merging. It results in a cleaner commit history. Or you can leave it as-is and I'll git rebase -i later.

@danbopes
Copy link
Author

danbopes commented May 14, 2025

Merge branch 'shpaass:master' into master

I advise to use rebasing in the future instead of merging. It results in a cleaner commit history. Or you can leave it as-is and I'll git rebase -i later.

In the future, I'll rebase. Just used the GitHub interface to sync the fork and it merged instead. Not used to syncing forks.

@danbopes
Copy link
Author

Okay, pretty sure we got the formatting/whitespace issues resolved, and I fixed/rebased everything

@shpaass
Copy link
Owner

shpaass commented May 14, 2025

Alright, then we wait for @DaleStan review, then either me or you squashes the fixes into relevant commits.

@shpaass
Copy link
Owner

shpaass commented May 14, 2025

Hmm, DaleStan said that the content is fine. So only squashes are left to be done. Please let me know if you want me to do it.

@danbopes danbopes force-pushed the master branch 3 times, most recently from f721ba8 to 229fef4 Compare May 14, 2025 09:52
Update blueprint and fix order (JsonPropertyName first, JsonIgnore second)
Make exporting entities with fuel configurable
Add support for exporting all building entities to one blueprint
Upgrade Blueprint classes to support new logistic filter sections
Fix issue when trying to export blueprint with modules
Support for new burner fuel inventory
Blueprints will now be exported with burner fuel inventory set
@shpaass
Copy link
Owner

shpaass commented May 14, 2025

Squashed the fix and added a commit subject.

Copy link
Owner

@shpaass shpaass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the feature, and welcome to the team!

@shpaass shpaass merged commit 58f5a3f into shpaass:master May 14, 2025
1 check passed
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.

Create single building blueprint fails with modules

4 participants