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

Hotfix for current stable #2971

Merged
merged 4 commits into from
Feb 1, 2024
Merged

Hotfix for current stable #2971

merged 4 commits into from
Feb 1, 2024

Conversation

perkinslr
Copy link
Contributor

Changes

Reverts #2949 for now.
Fixes typo (cherry pick from #2970 )

References

Links to the associated issues or other related pull requests, e.g.

Reasoning

Why did you choose to implement things this way, e.g.
Steam is currently mostly borked, this lets us get that working again without disrupting the dev branch progress.

Alternatives

Figure out the remaining issues with #2969 so it can be merged tonight. Will likely take too long.

Testing

Check tests you have performed:

  • Compiles without warnings
  • Game runs without errors
  • (For compatibility patches) ...with and without patched mod loaded
  • Playtested a colony (specify how long)

@perkinslr perkinslr requested review from a team as code owners February 1, 2024 08:37
@perkinslr perkinslr changed the base branch from master to Development February 1, 2024 09:12
Copy link

github-actions bot commented Feb 1, 2024

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7738819952.zip

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Feb 1, 2024
@N7Huntsman N7Huntsman mentioned this pull request Feb 1, 2024
4 tasks
@perkinslr perkinslr changed the base branch from Development to master February 1, 2024 09:32
Copy link

github-actions bot commented Feb 1, 2024

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7739101083.zip

Copy link

github-actions bot commented Feb 1, 2024

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7739360523.zip

Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

Fixes the issues we've seen in the 5.6 release.

@N7Huntsman N7Huntsman merged commit 34a2a36 into master Feb 1, 2024
2 checks passed
@N7Huntsman N7Huntsman deleted the 5.6hf-stable branch February 1, 2024 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants