Acuadragon100
536389af0b
Merge remote-tracking branch 'refs/remotes/root/main' into fix-portals
# Conflicts:
# common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
# common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.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
# forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java