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.

Sign up for GitHub

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

Jump to bottom

Merge with Wizden/Delta up to 15th March #30

Closed
wants to merge 2 commits into from
Closed

Merge with Wizden/Delta up to 15th March #30

wants to merge 2 commits into from

Conversation

DangerRevolution
Copy link
Contributor

Merge upstream up to the 15th like Delta OwO

can't type a lot, this is making my laptop run on 2 FPS just on this webpage

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files labels Mar 21, 2024
@DangerRevolution DangerRevolution changed the title Merge pull request #973 from DebugOk/2024/03/15-merge-upstream Merge with Wizden up to 15th March Mar 21, 2024
@DangerRevolution
Copy link
Contributor Author

oh fuck why does this change maps

@DangerRevolution DangerRevolution changed the title Merge with Wizden up to 15th March Merge with Wizden/Delta up to 15th March Mar 21, 2024
@DangerRevolution DangerRevolution marked this pull request as draft March 21, 2024 22:10
@DangerRevolution
Copy link
Contributor Author

Gonna set this to draft bc commit history got squashed and I should be doing my assignments instead of fucking around with Github

@DangerRevolution DangerRevolution mentioned this pull request Mar 21, 2024
Closed
@DEATHB4DEFEAT
Copy link
Member

DEATHB4DEFEAT commented Mar 22, 2024 •
edited
Loading

Make individual PRs for every feature you want ported

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 23, 2024
@DangerRevolution DangerRevolution marked this pull request as ready for review March 23, 2024 18:20
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 23, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT added the Type: Port Brings something to here from another codebase label Mar 24, 2024
@DangerRevolution
Copy link
Contributor Author

Just closing this PR because uh; people keep screenshotting my attempt to try out Git & merge cool things as some sort of representation of EE as a whole & people are taking my PR (someone not affiliated with the EE vision at all) and making it out to be some sort of statement about the intention of EE.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Type: Port Brings something to here from another codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DangerRevolution @DEATHB4DEFEAT @DebugOk