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

cherrypick 1.2.2.a #1236

Merged
merged 9 commits into from
May 11, 2024
Merged

cherrypick 1.2.2.a #1236

merged 9 commits into from
May 11, 2024

Conversation

screret
Copy link
Member

@screret screret commented May 11, 2024

No description provided.

@screret screret requested a review from a team as a code owner May 11, 2024 08:19
Copy link

@HandsomeAsianMan HandsomeAsianMan left a comment

Choose a reason for hiding this comment

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

yum

@screret screret merged commit 63bc3ba into 1.19.2 May 11, 2024
1 check passed
@screret screret deleted the sc/cherrypick-1.2.2.a branch May 11, 2024 12:05
DimaKuzmin pushed a commit to DimaKuzmin/GregTech-Modern that referenced this pull request Jun 1, 2024
* revert GregTechCEu#1206 because it made diamond ore not smeltable

* add a NO_ORE_SMELTING for no ore smelting

* amend changelog

* add missing recipe config things for bamboo, slabs, netherite block compression

* fix rotor material not serializing addon materials correctly

* fix slab tags

* oops

* chore: cherrypick

* fixed transformers to hold enough eu (GregTechCEu#1237)

---------

Co-authored-by: YoungOnion <[email protected]>
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.

4 participants