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

1.21 cherrypick #2016

Merged
merged 38 commits into from
Sep 25, 2024
Merged

1.21 cherrypick #2016

merged 38 commits into from
Sep 25, 2024

Conversation

screret
Copy link
Member

@screret screret commented Sep 24, 2024

No description provided.

DancingSnow0517 and others added 30 commits September 23, 2024 22:04
@DancingSnow0517 @krossgg
add sources to publishing (#1947)
c499c5a
@krossgg
Fixed improper behaviors (#1948)
45355bc
@krossgg
Tuned Tool Highlight Grid behavior (#1949)
247c762
@Spicierspace153 @krossgg
Disables unimplemented covers (#1961)
a7d90be
@JuiceyBeans @krossgg
Convert all stereo sounds to mono (#1966)
62e6be4
@JuiceyBeans @krossgg
Sculk fixes + datagen (#1968)
d065793
@JuiceyBeans @krossgg
Remove border lines from Laminated Glass CTM (#1972)
214601c
@krossgg
Quantum Storage Fixes (#1976)
6e91887
@krossgg
Misc texture fixes (#1974)
fae704b
@EasterFG @YoungOnionMC @krossgg
Fix jei drag (#1973)
98e12c1 
Co-authored-by: YoungOnion <[email protected]>
@krossgg
Fixed filtering on auto-transfer (#1982)
fbbb68d
@YoungOnionMC @krossgg
Steam Turbine Fix (#1983)
ffc3d6a
@Vextin @krossgg
Add Compressor recipe for snow balls -> snow (#1969)
bfa54ac
@a-a-GiTHuB-a-a @krossgg
Added rubber log variants to #minecraft:logs_that_burn (#1914)
f6d1814
@krossgg
Added gradle task for versioning and edited workflows (#1986)
f7f8d00
@krossgg
Update publishing.gradle (#1996)
8fa74ac
@krossgg
Fixed Publishing Workflows (#1997)
db59862
@EasterFG @krossgg
fix MEInputHatch not showing tooltip (#1993)
5ea5b99
@YoungOnionMC @krossgg
Boiler Burnables, Chain Recipe and Crate Tags (#1998)
aa77bd7
@Spicierspace153 @krossgg
fixes parallel for alloy smelters (#2004)
8ec4356 
Co-authored-by: Spicierspace153 <[email protected]>
@Zorbatron @krossgg
Fix ME Pattern Buffer Proxies not having the hand animation when open…
4b1b5ca 
…ing the GUI (#2005)
@YoungOnionMC @krossgg
Wirecutter/wrench tool sounds (#2006)
4382d14
@YoungOnionMC @krossgg
I fix turbine (#2010)
cc0a771
@YoungOnionMC @krossgg
Fix Multi smelter not overclocking (#2008)
dd92f60
@YoungOnionMC @krossgg
Optimized voltage tier lookups (#2007)
2a6da5a
@krossgg
Version-dependent fixes
d0a4077
@krossgg
spotless
0ba37e4
@YoungOnionMC @screret
Wood Recipes and Boats (#1980)
30c7eaf
@screret
port #1955
879c6f8
@screret
TODO
7a9ad02
@screret screret requested a review from a team as a code owner September 24, 2024 06:48
krossgg
krossgg approved these changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@krossgg krossgg left a comment

Choose a reason for hiding this comment

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

nice work but let me find this voltage bug before we push

@screret screret merged commit 41b9408 into 1.21 Sep 25, 2024
2 checks passed
@screret screret deleted the kr/1.21-cherrypick branch September 25, 2024 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krossgg krossgg krossgg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@screret @krossgg @DancingSnow0517 @Spicierspace153 @JuiceyBeans @EasterFG @YoungOnionMC @Vextin @a-a-GiTHuB-a-a @Zorbatron