Merge branch '1.20.1' into 1.20.2

Sollace · Sollace · commit e0255c0e9b09 · 2024-10-15T11:27:44.000+01:00
diff --git a/src/main/java/com/minelittlepony/unicopia/block/RockCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/RockCropBlock.java
@@ -64,7 +64,7 @@ public class RockCropBlock extends CropBlock {
     };
 
     protected RockCropBlock(Settings settings) {
-        super(settings);
+        super(settings.notSolid());
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public class RockCropBlock extends CropBlock {`
`64`	`64`	`};`
`65`	`65`
`66`	`66`	`protected RockCropBlock(Settings settings) {`
`67`		`- super(settings);`
	`67`	`+ super(settings.notSolid());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`