Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts

Author: rubensworks

CHANGELOG-1.20.1.md

@@ -1,8 +1,30 @@
 # Changelog for Minecraft 1.20.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.20.1-1.30.7"></a>
+## [1.20.1-1.30.7](/compare/1.20.1-1.30.6...1.20.1-1.30.7) - 2026-05-30 10:22:44
+
+
+### Fixed
+* Fix network reload when a machine state is changed
+
+This could cause issues where multiple instances of internal network
+states could be created, that are conflicting.
+Concretely, this fixes autocrafting issues where outputs from Mechanical
+machines could not be detected, as it coincided with a machine state
+change.
+
+Closes CyclopsMC/IntegratedCrafting#199
+
+<a name="1.20.1-1.30.6"></a>
+## [1.20.1-1.30.6](/compare/1.20.1-1.30.5...1.20.1-1.30.6) - 2026-05-22 11:26:53 +0200
+
+
+### Fixed
+* Fix parts not being directly placeable opposite to other parts
+
 <a name="1.20.1-1.30.5"></a>
-## [1.20.1-1.30.5](/compare/1.20.1-1.30.4...1.20.1-1.30.5) - 2026-04-28 19:37:09
+## [1.20.1-1.30.5](/compare/1.20.1-1.30.4...1.20.1-1.30.5) - 2026-04-28 19:37:09 +0200
 
 
 ### Fixed

resources/changelog/1.20.1-1.30.6.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Fixes:
+* Fix parts not being directly placeable opposite to other parts

resources/changelog/1.20.1-1.30.7.txt

@@ -0,0 +1,13 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Fixes:
+* Fix network reload when a machine state is changed
+
+This could cause issues where multiple instances of internal network
+states could be created, that are conflicting.
+Concretely, this fixes autocrafting issues where outputs from Mechanical
+machines could not be detected, as it coincided with a machine state
+change.
+
+Closes CyclopsMC/IntegratedCrafting#199

src/main/java/org/cyclops/integrateddynamics/block/BlockCable.java

@@ -250,7 +250,7 @@ protected ItemInteractionResult useItemOn(ItemStack pStack, BlockState pState, L
     @Override
     public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean isMoving) {
         super.onPlace(state, world, pos, oldState, isMoving);
-        if (!world.isClientSide() && !SKIP_NETWORK_INIT) {
+        if (!world.isClientSide() && !SKIP_NETWORK_INIT && oldState.getBlock() != this) {
             ICableFakeable cableFakeable = CableHelpers.getCableFakeable(world, pos, null).orElse(null);
             if (cableFakeable != null && cableFakeable.isRealCable()) {
                 CableHelpers.onCableAdded(world, pos);

src/main/java/org/cyclops/integrateddynamics/core/block/BlockContainerCabled.java

@@ -46,7 +46,7 @@ public ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Lev
     @Override
     public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean isMoving) {
         super.onPlace(state, world, pos, oldState, isMoving);
-        if (!world.isClientSide()) {
+        if (!world.isClientSide() && oldState.getBlock() != this) {
             CableHelpers.onCableAdded(world, pos);
         }
     }

src/main/java/org/cyclops/integrateddynamics/core/block/BlockWithEntityGuiCabled.java

@@ -54,7 +54,7 @@ public ItemInteractionResult useItemOn(ItemStack pStack, BlockState blockState,
     @Override
     public void onPlace(BlockState blockState, Level world, BlockPos blockPos, BlockState oldState, boolean isMoving) {
         super.onPlace(blockState, world, blockPos, oldState, isMoving);
-        if (!world.isClientSide()) {
+        if (!world.isClientSide() && oldState.getBlock() != this) {
             CableHelpers.onCableAdded(world, blockPos);
         }
     }