Skip to content

Commit

Permalink
Merge branch '1.21.0' into 1.21.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/zenith/mc/block/BlockRegistry.java
  • Loading branch information
rfresh2 committed Jan 27, 2025
2 parents 7d5eca8 + cbfef92 commit b749f2a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/com/zenith/mc/block/BlockRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ public final class BlockRegistry {

public static final Block STONE_BUTTON = REGISTRY.register(new Block(259, "stone_button", false, 5917, 5940, 0, BlockOffsetType.NONE, 0.25f, 0.2f, 0.5f, false, EnumSet.of(BlockTags.MINEABLE_WITH_PICKAXE)));

public static final Block SNOW = REGISTRY.register(new Block(260, "snow", false, 5941, 5948, 8, BlockOffsetType.NONE, 0.25f, 0.2f, 0.1f, true, EnumSet.of(BlockTags.MINEABLE_WITH_SHOVEL)));
public static final Block SNOW = REGISTRY.register(new Block(260, "snow", true, 5941, 5948, 8, BlockOffsetType.NONE, 0.25f, 0.2f, 0.1f, true, EnumSet.of(BlockTags.MINEABLE_WITH_SHOVEL)));

public static final Block ICE = REGISTRY.register(new Block(261, "ice", true, 5949, 5949, 5, BlockOffsetType.NONE, 0.25f, 0.2f, 0.5f, false, EnumSet.of(BlockTags.MINEABLE_WITH_PICKAXE)));

Expand Down

0 comments on commit b749f2a

Please sign in to comment.