mirror of
https://gitlab.bixilon.de/bixilon/minosoft.git
synced 2025-09-07 22:39:01 -04:00

# Conflicts: # src/main/java/de/bixilon/minosoft/data/registries/tweaker/VersionTweaker.kt # src/main/java/de/bixilon/minosoft/data/world/Chunk.kt # src/main/java/de/bixilon/minosoft/data/world/World.kt # src/main/java/de/bixilon/minosoft/gui/rendering/block/WorldRenderer.kt # src/main/java/de/bixilon/minosoft/gui/rendering/block/renderable/block/ElementRenderer.kt # src/main/java/de/bixilon/minosoft/gui/rendering/block/renderable/fluid/FluidRenderer.kt # src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/GreedyBakedBlockModel.kt # src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChunkDataS2CP.kt # src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassChunkDataS2CP.kt