Merge branch 'master' into 1.15

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

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.3+build.167
 
 # Mod Properties
-	mod_version = 1.1.2+v191009
+	mod_version = 1.1.3+v191016
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

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.honeyGlidingSlime && direction_1 != direction_2)
+        if (CarpetSettings.honeySlime && 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

@@ -27,7 +27,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.1.2+v191009";
+    public static final String carpetVersion = "1.1.3+v191016";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;
@@ -151,11 +151,11 @@ public class CarpetSettings
     public static boolean movableBlockEntities = false;
 
     @Rule(
-            desc = "Honey doesn't stick to Slime and vice versa",
-            extra = "In 1.14 that behaviour is applied to orange stained glass instead",
+            desc = "Orange stained glass behaves like slime, but doesn't stick to it",
+            extra = "Only available for 1.14. in 1.15 use honey instead",
             category = {EXPERIMENTAL, FEATURE}
     )
-    public static boolean honeyGlidingSlime = false;
+    public static boolean honeySlime = false;
 
     @Rule( desc = "Saplings turn into dead shrubs in hot climates and no water access", category = FEATURE )
     public static boolean desertShrubs = false;

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.1.2",
+  "version": "1.1.3",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",