Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 11:39:07 +00:00
Code Issues Releases Activity
Files
5b7c0b2bc3bd1abb8216c8649e51732c0ebb41fc
Iris-World-Engine/core/src/main
History
RePixelatedMC 5b7c0b2bc3 Merge branch 'PixelatedDev' of https://github.com/RePixelatedMC/Iris into PixelatedDev 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
#	core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
2024-04-09 20:07:50 +02:00
..
java/com/volmit/iris
Merge branch 'PixelatedDev' of https://github.com/RePixelatedMC/Iris into PixelatedDev
2024-04-09 20:07:50 +02:00
resources
Merge branch 'Pixeldev' into origin
2023-12-23 20:53:18 +01:00