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

Hai legacy scene + anomalocaris #367

Merged
merged 34 commits into from
Jan 19, 2025
Merged

Conversation

Hurleveur
Copy link
Member

to be merged with endless-sky/endless-sky#8828

@Zitchas
Copy link
Member

Zitchas commented Jul 16, 2023

That's an awesome scene. Just saying.

@Zitchas Zitchas added the Content New content to match vanilla. label Jul 16, 2023
@Hurleveur
Copy link
Member Author

Agreed, and you can thank @RisingLeaf for it!

@Hurleveur Hurleveur changed the title Hai legacy scene Hai legacy scene + rusty ladybug Jul 16, 2023
@Hurleveur Hurleveur changed the title Hai legacy scene + rusty ladybug Hai legacy scene + anomalocaris Aug 26, 2023
Copy link

@TheGiraffe3 TheGiraffe3 left a comment

Choose a reason for hiding this comment

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

Please resolve conflicts to make it easier for the merger.

copyright Outdated Show resolved Hide resolved
copyright Outdated Show resolved Hide resolved
copyright Outdated Show resolved Hide resolved
@Saugia Saugia merged commit 3f85a58 into endless-sky:master Jan 19, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content New content to match vanilla.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants