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

Add support for static rail cars #280

Merged

Conversation

bobmoretti
Copy link
Contributor

These don't have a canCargo or catgeory field in the mission table, when saved with the mission editor.

Without the associated changes to unit.py, the test cases here fail.

@DanAlbert
Copy link
Collaborator

Looks like this conflicts with your other PR that I just merged, but LGTM.

@rp- rp- mentioned this pull request Dec 29, 2022
@bobmoretti
Copy link
Contributor Author

Oh yeah, makes sense, thanks for looking at this. This should be a trivial conflict to resolve. I'll rebase and fix it. Happy holidays.

These don't have a `canCargo` or `catgeory` field in the mission table,
when saved with the mission editor.
@bobmoretti bobmoretti force-pushed the user/bobmoretti/static-optional-catgeory branch from f6393e9 to d96940a Compare January 3, 2023 08:22
@bobmoretti
Copy link
Contributor Author

@DanAlbert sorry for the delay, rebased and good to go now.

@DanAlbert DanAlbert merged commit 7d60f9b into pydcs:master Jan 3, 2023
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.

2 participants