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

Surplus ops, but it's only the shuttle. #11000

Conversation

NightmareChamillian
Copy link
Contributor

@NightmareChamillian NightmareChamillian commented Sep 24, 2022

About the PR

As the title describes, this is only the map changes to z2.

Why's this needed?

Note that this shouldn't be merged until afterward #10999 goes through. Furthermore there will be a few merge conflicts, namely for placeholder objects I made.

@boring-cyborg boring-cyborg bot added the A-Mapping A mapping change label Sep 24, 2022
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 24, 2022
@NightmareChamillian
Copy link
Contributor Author

just realized a better way to do this

@ZeWaka ZeWaka added the E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. label Sep 24, 2022
@NightmareChamillian NightmareChamillian marked this pull request as draft September 25, 2022 00:09
@NightmareChamillian
Copy link
Contributor Author

Likewise to the code PR, closing to put on the backburner.

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Oct 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Mapping A mapping change E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants