Skip to content

Merge 1.20.1 into mui2#4718

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

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

Conversation

@gustovafing
Copy link
Member

@gustovafing gustovafing commented Mar 6, 2026

Merges latest 1.20.1 changes into mui2

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

gustovafing and others added 18 commits February 17, 2026 00:18
@gustovafing
Port hazard and exhaust interfaces to trait system (#4584)
28bff24
@Phoenixvine32908
Update seperatedInto() description. (#4663)
8cab09f
@bernd-sbr
PipeBlock neighbor change logic fix (#4664)
4acaf3d
@Mqrius
Make groupColor optional even if KubeJS isn't loaded (#4684)
6f0fbae
@YoungOnionMC
Fix up output item bus filter (#4686)
e3504c5
@gustovafing
Add multiblock traits and syncable traits (#4607)
1e749f9
@gustovafing
Move some item classes (#4668)
63697bf
@Mqrius
Clear categoryMap on reload to reload EMI correctly (#4683)
53cf5b1
@gustovafing
move/rename some forge specific stuff (#4655)
00e4156
@gustovafing
merge gt fluid and gt fluid impl (#4656)
5095d45
@Taskeren @YoungOnionMC
1.20 Xaero's series fix (#4685)
9ad23f9 
Co-authored-by: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com>
@Bumperdo09
fluid regulators now check that the correct amount of fluid was moved (…
47847e7 
…#4693)
@Taskeren
Add #dragon_immune tag to endstone-based ores (#4689)
e126099
@gustovafing
Refactor BE interaction methods (#4702)
55bde8f
@TarLaboratories
Fix #4706 (#4708)
d1bfccd
@Lapis256
Fix Ender Link Cover memory card copy/paste and required-item handling (
6c1ae3b 
#4691)
@Mqrius
Fix validation for item and fluid tags (#4699)
114d1c7
@gustovafing
Merge branch '1.20.1' into gus/update-mui2-to-latest
50d7c58 
# 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
gustovafing and others added 7 commits March 7, 2026 09:49
@gustovafing
add utils for searching recipes from outside of a machine (#4703)
a743c7c
@iouter
Update zh_cn.json 1.20.1 (#4716)
a5cad24
@Taskeren
Add windmill sails spray coloring support (#4690)
7feccc8
@HazeVista
added a lang provider for key missing provider (#4701)
e60aa18
@Mqrius
Improve getBlockState performance (#4727)
e191a08
@gustovafing
Merge branch '1.20.1' into gus/update-mui2-to-latest
29972ff
@gustovafing
Merge branch 'mui2-refactor' into gus/update-mui2-to-latest
771bded 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java
#	src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/trait/AutoOutputTrait.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/machine/electric/ConverterMachine.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.