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

prototype composition #7403

Closed
wants to merge 4 commits into from
Closed

prototype composition #7403

wants to merge 4 commits into from

Conversation

PaulRitter
Copy link
Member

@PaulRitter PaulRitter mentioned this pull request Apr 3, 2022
Closed
@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Apr 3, 2022
@wrexbe wrexbe added Needs Engine PR This PR is awaiting engine changes that should be merged before this. Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels May 29, 2022
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2022

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

@metalgearsloth
Merge remote-tracking branch 'upstream/master' into 2022_04_03_proto_…
ac90044 
…comp

# Conflicts:
#	Content.Server/Construction/Commands/TileWallsCommand.cs
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 18, 2022
@metalgearsloth metalgearsloth added the Status: Derelict This PR appears to be abandoned but might contain something that can be salvaged. label Jun 18, 2022
@metalgearsloth
Copy link
Contributor

I tried

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth metalgearsloth approved these changes

@mirrorcult mirrorcult Awaiting requested review from mirrorcult

@Zumorica Zumorica Awaiting requested review from Zumorica

@moonheart08 moonheart08 Awaiting requested review from moonheart08

Assignees
No one assigned
Labels
Needs Engine PR This PR is awaiting engine changes that should be merged before this. Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. Status: Derelict This PR appears to be abandoned but might contain something that can be salvaged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@PaulRitter @metalgearsloth @wrexbe