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

Expand state #77

Merged
merged 33 commits into from
Aug 10, 2024
Merged

Expand state #77

merged 33 commits into from
Aug 10, 2024

Conversation

rster2002
Copy link
Owner

No description provided.

@rster2002 rster2002 added this to the Version 0.6.0 milestone Jul 6, 2024
@rster2002 rster2002 self-assigned this Jul 20, 2024
@rster2002 rster2002 marked this pull request as ready for review August 10, 2024 20:31
# Conflicts:
#	src/modules/exobiology/models/species.rs
#	src/modules/journal/models/journal_event_kind.rs
#	src/modules/ship/models/ship_module.rs
#	src/modules/state/mod.rs
#	src/modules/state/models.rs
#	src/modules/state/models/game_state.rs
#	src/modules/state/models/mission_state.rs
#	src/modules/state/models/resolvers/carrier_state_resolver.rs
#	src/modules/state/models/resolvers/log_state_resolver.rs
#	src/modules/state/models/resolvers/planet_state_resolver.rs
#	src/modules/state/models/resolvers/system_state_resolver.rs
@rster2002 rster2002 merged commit 8d22f3b into master Aug 10, 2024
6 checks passed
@rster2002 rster2002 deleted the expand-state branch August 10, 2024 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment