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

Fork Sync: Update from parent repository #31

Merged
merged 12 commits into from
Mar 14, 2023

Conversation

github-actions[bot]
Copy link

No description provided.

ekaratzas and others added 12 commits March 13, 2023 12:17
* megastore cleanup

merged maps, repalettized roof, mapgen upgrades

* office update

* fix trashcan table

* re-add shredder, move carts to palette, item fix

* lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Delete megastore.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot merged commit 52f2524 into SurFlurer:cnk-multi Mar 14, 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.

10 participants