Julian Krings 86f89bc718 Merge remote-tracking branch 'origin/master' into iris4 ...

# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.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

2024-08-03 18:50:38 +02:00

..

src/main

Merge remote-tracking branch 'origin/master' into iris4

2024-08-03 18:50:38 +02:00

build.gradle

update oraxen api

2024-06-24 13:17:11 +02:00