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

Chests #98

Merged
merged 11 commits into from
Apr 1, 2024
Merged

Chests #98

merged 11 commits into from
Apr 1, 2024

Conversation

TiagoFar78
Copy link
Owner

This PR was made in order to implement everything related to chests and other kind of containers arround the map.

@TiagoFar78 TiagoFar78 added the enhancement New feature or request label Mar 30, 2024
@TiagoFar78 TiagoFar78 self-assigned this Mar 30, 2024
@TiagoFar78 TiagoFar78 linked an issue Mar 30, 2024 that may be closed by this pull request
@TiagoFar78 TiagoFar78 marked this pull request as ready for review April 1, 2024 00:26
@TiagoFar78 TiagoFar78 requested a review from iquelli April 1, 2024 00:28
@iquelli
Copy link
Collaborator

iquelli commented Apr 1, 2024

You have some commits that are not part of this PR

@TiagoFar78
Copy link
Owner Author

Isn't that supposed? I thought it was because of rebase.

@iquelli
Copy link
Collaborator

iquelli commented Apr 1, 2024

Isn't that supposed? I thought it was because of rebase.

No, did u use git push -f ?

@iquelli
Copy link
Collaborator

iquelli commented Apr 1, 2024

I'm scared that like this the code will be duplicated

@TiagoFar78
Copy link
Owner Author

I don't think that is a problem because this commit uses BukkitWorldEditorClass and in the changed files there is nothing like that. I don't think we need to worry.

@TiagoFar78
Copy link
Owner Author

Besides that there are no merge conflicts so I think it's alright. Even if this generates duplicate code I will fix it right away, but I don't know how to fix it in this branch without losing everything I have already done.

@iquelli
Copy link
Collaborator

iquelli commented Apr 1, 2024

Okay, but next time do:

  • git rebase master
  • (solve conflicts)
  • git push -f

@iquelli iquelli merged commit b40820a into master Apr 1, 2024
2 checks passed
@TiagoFar78
Copy link
Owner Author

Thanks

@TiagoFar78 TiagoFar78 deleted the chests branch April 1, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ENH: Containers and Chests
2 participants