Skip to content

Merge 1.20.1 into mui2#4718

Open
gustovafing wants to merge 18 commits intomui2-refactorfrom
gus/update-mui2-to-latest
Open

Merge 1.20.1 into mui2#4718
gustovafing wants to merge 18 commits intomui2-refactorfrom
gus/update-mui2-to-latest

Conversation

@gustovafing
Copy link
Member

Merges latest 1.20.1 changes into mui2

** DONT SQUASH MERGE THIS!!!!! **

gustovafing and others added 18 commits February 17, 2026 00:18
Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com>
# Conflicts:
#	docs/content/Modpacks/Changes/v8.0.0.md
#	src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/sync_system/data_transformers/ValueTransformer.java
#	src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
#	src/main/java/com/gregtechceu/gtceu/common/cover/ender/AbstractEnderLinkCover.java
#	src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderFluidLinkCover.java
#	src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderItemLinkCover.java
#	src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java
#	src/main/java/com/gregtechceu/gtceu/common/cover/voiding/ItemVoidingCover.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
#	src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java
#	src/main/java/com/gregtechceu/gtceu/common/item/behavior/FluidFilterBehaviour.java
#	src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java
#	src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFilterBehaviour.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MufflerPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeTankMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java
#	src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java
@gustovafing gustovafing requested a review from a team as a code owner March 6, 2026 09:51
@gustovafing gustovafing added type: refactor Suggestion to refactor a section of code 1.20.1 Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. labels Mar 6, 2026
@github-actions github-actions bot added the Tests: Passed Game Tests have passed on this PR label Mar 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.20.1 Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. Tests: Passed Game Tests have passed on this PR type: refactor Suggestion to refactor a section of code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants