mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-24 00:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into mca

Browse Source 
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
This commit is contained in:
CrazyDev22
2024-05-19 20:48:13 +02:00
parent d9f8909bdc 96dd299de7
commit eb19d9a846
32 changed files with 1125 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
settings.gradle
View File

@@ -26,6 +26,7 @@ rootProject.name = 'Iris'
include 'app', 'com.volmit.gui'
include(':core')
include(
':nms:v1_20_R4',
':nms:v1_20_R3',
':nms:v1_20_R2',
':nms:v1_20_R1',