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

Full data generation + API + 1.19.4 port #16

Merged
merged 13 commits into from
Mar 24, 2023

Conversation

maximumpower55
Copy link
Contributor

No description provided.

Copy link
Contributor

@Ampflower Ampflower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might turn mostly into "accidental revert?", so, I'll kinda cut it here.

Seems that several files were reverted to pretty old states, such as issue templates, the README and other things.

You may want to rebase or selectively revert the reverts that weren't intended and squash them.

.github/ISSUE_TEMPLATE/block-suggestion.yaml Outdated Show resolved Hide resolved
.github/ISSUE_TEMPLATE/block-suggestion.yaml Outdated Show resolved Hide resolved
.github/ISSUE_TEMPLATE/config.yml Outdated Show resolved Hide resolved
.github/ISSUE_TEMPLATE/bug_report.yml Outdated Show resolved Hide resolved
@Ampflower
Copy link
Contributor

Looking a bit into it, it does seem like the last merge commit erroneously reverted to the equivalent of the 1.18 branch, which seems odd; you could undo the incorrect changes done by the merge and squash it into the merge commit at least.

@maximumpower55
Copy link
Contributor Author

maximumpower55 commented Mar 24, 2023

Looks like github auto merge died, fixing

@maximumpower55
Copy link
Contributor Author

maximumpower55 commented Mar 24, 2023

And I did rebase but I had to also merge for some reason

Copy link
Contributor

@Ampflower Ampflower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mainly the version and the package of a few classes I'm concerned with.

implements Waterloggable would be a good touch tho, if the classes that don't implement it could benefit from implementing it. There might not be a change in behaviour for the various blocks tho.

README.md Outdated Show resolved Hide resolved
Copy link
Contributor

@Ampflower Ampflower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

Copy link
Collaborator

@woodiertexas woodiertexas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks to be ready to go.

@woodiertexas woodiertexas merged commit b480405 into DebuggyTeam:rewrite Mar 24, 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.

3 participants