Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev

IThundxr · IThundxr · commit baab227fa326 · 2025-10-31T17:15:42.000-04:00
diff --git a/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java
@@ -81,7 +81,7 @@ public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Bloc
 		Optional<SignalBlockEntity> ste = getBlockEntityOptional(pLevel, pPos);
 		boolean neighborPowered = false;
 		if (ste.isEmpty() || !ste.get().computerBehaviour.hasAttachedComputer()) {
-			powered = pLevel.hasNeighborSignal(pPos);
+			neighborPowered = pLevel.hasNeighborSignal(pPos);
 		}
 		if (powered == neighborPowered)
 			return;
diff --git a/src/main/resources/assets/create/lang/lt_lt.json b/src/main/resources/assets/create/lang/lt_lt.json
@@ -51,4 +51,4 @@
   "block.create.gearshift": "Pavarų svirtis",
   "block.create.large_cogwheel": "Didelis Dantratis",
   "item.create.vertical_gearbox": "Vertikali Pavarų Dėžė"
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Bloc`
`81`	`81`	`Optional<SignalBlockEntity> ste = getBlockEntityOptional(pLevel, pPos);`
`82`	`82`	`boolean neighborPowered = false;`
`83`	`83`	`if (ste.isEmpty() \|\| !ste.get().computerBehaviour.hasAttachedComputer()) {`
`84`		`- powered = pLevel.hasNeighborSignal(pPos);`
	`84`	`+ neighborPowered = pLevel.hasNeighborSignal(pPos);`
`85`	`85`	`}`
`86`	`86`	`if (powered == neighborPowered)`
`87`	`87`	`return;`