Merge branch '1.20.4'

* 1.20.4: removed tall plants
Faboslav · Jan 20, 2024 · 75bab52 · 75bab52
2 parents 8c7a274 + ef0457e
commit 75bab52
Showing 1 changed file with 0 additions and 26 deletions.
diff --git a/common/src/main/resources/data/friendsandfoes/worldgen/processor_list/beekeeper_hut.json b/common/src/main/resources/data/friendsandfoes/worldgen/processor_list/beekeeper_hut.json
@@ -152,32 +152,6 @@
 						"Name": "minecraft:lilac"
 					}
 				},
-				{
-					"input_predicate": {
-						"block": "minecraft:poppy",
-						"predicate_type": "minecraft:random_block_match",
-						"probability": 0.04
-					},
-					"location_predicate": {
-						"predicate_type": "minecraft:always_true"
-					},
-					"output_state": {
-						"Name": "minecraft:rose_bush"
-					}
-				},
-				{
-					"input_predicate": {
-						"block": "minecraft:poppy",
-						"predicate_type": "minecraft:random_block_match",
-						"probability": 0.04
-					},
-					"location_predicate": {
-						"predicate_type": "minecraft:always_true"
-					},
-					"output_state": {
-						"Name": "minecraft:peony"
-					}
-				},
 				{
 					"input_predicate": {
 						"block": "minecraft:poppy",