3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-25 15:50:10 +01:00
ViaVersion/bukkit
Nassim Jahnke a8dc5f0f07
Merge branch 'master' into dev
# Conflicts:
#	common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java
#	common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
#	common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
2024-02-12 10:44:03 +01:00
..
src/main Merge branch 'master' into dev 2024-02-12 10:44:03 +01:00
build.gradle.kts Include api sources in common sources jar 2023-11-06 20:04:45 +10:00