Merge branch 'master' into 1.15

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

@@ -151,9 +151,8 @@ public class CarpetSettings
     public static boolean movableBlockEntities = false;
 
     @Rule(
-            desc = "Honey blocks can stick to each other and other blocks",
+            desc = "Honey doesn't stick to Slime and vice versa",
-            extra = {"... but not to slime blocks and vice versa.",
+            extra = "In 1.14 that behaviour is applied to orange stained glass instead",
-                "In 1.14 that behaviour is applied to gold blocks instead"},
             category = {EXPERIMENTAL, FEATURE}
     )
     public static boolean honeyGlidingSlime = false;