Merge branch 'BOP-1.18.x-15.x.x' of https://github.com/Glitchfiend/BiomesOPlentyDev into BOP-1.18.x-15.x.x

# Conflicts:
#	public/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
#	src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java
#	src/main/java/biomesoplenty/init/ModBiomes.java
This commit is contained in:
Adubbz 2021-12-05 13:55:17 +11:00
commit 3ae595285a

View file

@ -16,6 +16,7 @@ public class BOPBiomes
public static final ResourceKey<Biome> CHERRY_BLOSSOM_GROVE = register("cherry_blossom_grove");
public static final ResourceKey<Biome> CONIFEROUS_FOREST = register("coniferous_forest");
public static final ResourceKey<Biome> LAVENDER_FIELD = register("lavender_field");
public static final ResourceKey<Biome> REDWOOD_FOREST = register("redwood_forest");
public static final ResourceKey<Biome> WOODLAND = register("woodland");
private static ResourceKey<Biome> register(String name)