Merged with master

core/src/mindustry/world/blocks/Floor.java

@@ -222,4 +222,4 @@ public class Floor extends Block{
         return block.edges()[x][2 - y];
     }
 
-}
+}

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -378,4 +378,4 @@ public class Conveyor extends Block implements Autotiler{
             }
         }
     }
-}
+}

core/src/mindustry/world/blocks/distribution/Junction.java

@@ -23,7 +23,6 @@ public class Junction extends Block{
         super(name);
         update = true;
         solid = true;
-        instantTransfer = true;
         group = BlockGroup.transportation;
         unloadable = false;
         entityType = JunctionEntity::new;

core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

@@ -39,7 +39,6 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
             }
 
             if(entity.uptime >= 0.5f){
-
                 if(tryMoveLiquid(tile, other, false, entity.liquids().current()) > 0.1f){
                     entity.cycleSpeed = Mathf.lerpDelta(entity.cycleSpeed, 4f, 0.05f);
                 }else{

core/src/mindustry/world/blocks/production/GenericCrafter.java

@@ -137,7 +137,7 @@ public class GenericCrafter extends Block{
         if(outputItem != null && tile.entity.items().get(outputItem.item) >= itemCapacity){
             return false;
         }
-        return outputLiquid == null || !(tile.entity.liquids().get(outputLiquid.liquid) >= liquidCapacity);
+        return outputLiquid == null || !(tile.entity.liquids().get(outputLiquid.liquid) >= liquidCapacity - 0.001f);
     }
 
     @Override

core/src/mindustry/world/meta/values/FloorValue.java

@@ -18,4 +18,4 @@ public class FloorValue implements StatValue{
         table.add(new Image(floor.icon(Cicon.small))).padRight(3);
         table.add(floor.localizedName).padRight(3);
     }
-}
+}