Backports blocks from 1.20 and 1.21.4

To enhance the over-world without adding biomes, but instead reworking the already existing ones