Julian Krings
|
fe7da2ca1e
|
Merge branch 'dev' into feat/datapack_structures
# Conflicts:
# build.gradle
# core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
# core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
# core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
# core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
# core/src/main/resources/plugin.yml
# nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
# nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
# nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
# nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
# nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
# nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java
# nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/IrisChunkGenerator.java
# nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java
|
2025-07-20 12:59:02 +02:00 |
|