Vojtěch Šokala
6b32ab02d3
Merge branch 'main' of https://gitlab.com/distant-horizons-team/distant-horizons
# Conflicts:
# common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java