Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java

src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java

@@ -32,7 +32,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock
     @Inject(method = "isMovable", at = @At("HEAD"), cancellable = true)
     private static void slimeHoney(BlockState blockState_1, World world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, Direction direction_2, CallbackInfoReturnable<Boolean> cir)
     {
-        if (CarpetSettings.stickyHoney && direction_1 != direction_2)
+        if (CarpetSettings.honeyGlidingSlime && direction_1 != direction_2)
         {
             Block block = blockState_1.getBlock();
             if (block != Blocks.HONEY_BLOCK && block != Blocks.SLIME_BLOCK) return;

src/main/java/carpet/settings/CarpetSettings.java

@@ -156,7 +156,7 @@ public class CarpetSettings
                 "In 1.14 that behaviour is applied to gold blocks instead"},
             category = {EXPERIMENTAL, FEATURE}
     )
-    public static boolean stickyHoney = false;
+    public static boolean honeyGlidingSlime = false;
 
     @Rule( desc = "Saplings turn into dead shrubs in hot climates and no water access", category = FEATURE )
     public static boolean desertShrubs = false;