Steveplays28
1ea62fd5ec
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java
# coreSubProjects
# fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
# forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java