Update mui2 to latest 1.20.1 by gustovafing · Pull Request #4788 · GregTechCEu/GregTech-Modern

gustovafing · 2026-04-15T02:22:17Z

What

Wait until #4783 is merged

…type (#4632)

Co-authored-by: Western01 <alexgruzdev47@gmail.com>

…tion (#4771)

# Conflicts: # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputFluidConfigHandler.java # src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/AutoOutputItemConfigHandler.java # src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/WorkableTieredMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CombinedDirectionalFancyConfigurator.java # src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.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/machine/steam/SteamWorkableMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java # src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/BatteryBufferMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/BlockBreakerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/ChargerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/FisherMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/ItemCollectorMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/PowerSubstationMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/HPCAMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/NetworkSwitchMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCABridgePartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAComputationPartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCACoolerPartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/hpca/HPCAEmptyPartMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveBlastFurnaceMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/BufferMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.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/common/machine/trait/AutoOutputTrait.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/CentralMonitorLogic.java # src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEOutputHatchPartMachine.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/resources/gtceu.mixins.json

# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java # src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ObjectHolderMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java

Co-authored-by: Western01 <alexgruzdev47@gmail.com>

# Conflicts: # gradle/scripts/repositories.gradle # src/main/java/com/gregtechceu/gtceu/api/item/tool/IToolGridHighlight.java # src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/TieredEnergyMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java # src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/trait/feature/IRenderingTrait.java # src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolarBoiler.java # src/main/java/com/gregtechceu/gtceu/common/machine/storage/CrateMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java

Mqrius and others added 22 commits March 14, 2026 11:27

EMI synthetic recipe warning fix (#4732)

7af0e91

fix null pointer exception (#4739)

fe879b3

Allow non-1.20.1 or 1.21 branch releases (#4748)

a72bf74

Fix item count in chancedInput and chancedOutput (#4709)

c83e43b

fix tiny sync errors (#4756)

f18acfd

Render Central Monitor drawings across vertical groups (#4765)

9ea94d7

Fix & clean up medical conditions (#4066)

ba1d62f

Make recipe iterator hasNext work properly (#4770)

e1bce8d

Reword some death messages & remove the (duplicate) explosion damage …

8589a3b

…type (#4632)

Add readable placeholder exception to show instead of a java exception (

af86041

#4772)

Allow referencing multiple targets from one group (CM) (#4774)

a505994

Feat: PT_BR localization (#4758)

d3d0068

Updated PT_BR localization (#4778)

9cfcace

Translated using Weblate (Russian) (#4742)

53a2aea

Co-authored-by: Western01 <alexgruzdev47@gmail.com>

Fix datagen sometimes crashing because of concurrent keybind registra…

6279f88

…tion (#4771)

Refactor machine trait attachment (#4779)

49e6630

add trait priority (#4784)

11d2334

update notifiable item handler drop behaviour (#4786)

b5dbec2

fix accidentally loading client stuff

679bb27

Make the machine cover container a machine trait (#4785)

54012ac

gustovafing requested a review from a team as a code owner April 15, 2026 02:22

github-actions Bot added the Tests: Failed Game Tests have failed on this PR label Apr 15, 2026

marisathewitch and others added 6 commits April 16, 2026 19:07

Updated RU_RU localization (#4782)

cf5e10c

Co-authored-by: Western01 <alexgruzdev47@gmail.com>

Make getFluidsDuringLoad return type generic (#4712)

5ee81b1

Improve FluidIngredient::getStacks dedup performance (#4715)

6e2efdd

Fix FluidIngredient::toJson (#4714)

9bdf60f

fix merge issue

aa59e31

Add more repository source overrides (#4794)

04c218c

gustovafing and others added 3 commits April 20, 2026 04:31

Add more javadoc for machine classes (#4783)

89f9401

spotless

dc68b8b

github-actions Bot added Tests: Passed Game Tests have passed on this PR and removed Tests: Failed Game Tests have failed on this PR labels Apr 20, 2026

TechLord22 approved these changes Apr 28, 2026

View reviewed changes

TechLord22 merged commit 3a02991 into mui2-refactor Apr 28, 2026
4 checks passed

TechLord22 deleted the gus/update-mui2-to-latest branch April 28, 2026 13:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update mui2 to latest 1.20.1#4788

Update mui2 to latest 1.20.1#4788
TechLord22 merged 31 commits into
mui2-refactorfrom
gus/update-mui2-to-latest

gustovafing commented Apr 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Conversation

gustovafing commented Apr 15, 2026

What

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants