mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-16 22:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PixelatedDev' of https://github.com/RePixelatedMC/Iris into PixelatedDev

Browse Source 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
#	core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
This commit is contained in:
RePixelatedMC
2024-04-09 20:07:50 +02:00
parent fc15175ff9 63b8a935ae
commit 5b7c0b2bc3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/core/IrisSettings.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class IrisSettings {
public static class IrisSettingsGenerator { public static class IrisSettingsGenerator {
public String defaultWorldType = "overworld"; public String defaultWorldType = "overworld";
public int maxBiomeChildDepth = 4; public int maxBiomeChildDepth = 4;
// public boolean forceConvertTo320Height = false; public boolean forceConvertTo320Height = false;
public boolean preventLeafDecay = true; public boolean preventLeafDecay = true;
} }
core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+3
View File
@@ -19,6 +19,7 @@
package com.volmit.iris.engine.object; package com.volmit.iris.engine.object;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.IrisRegistrant;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
@@ -210,6 +211,8 @@ public class IrisDimension extends IrisRegistrant {
private IrisCarving carving = new IrisCarving(); private IrisCarving carving = new IrisCarving();
@Desc("Configuration of fluid bodies such as rivers & lakes") @Desc("Configuration of fluid bodies such as rivers & lakes")
private IrisFluidBodies fluidBodies = new IrisFluidBodies(); private IrisFluidBodies fluidBodies = new IrisFluidBodies();
@Desc("forceConvertTo320Height")
private Boolean forceConvertTo320Height = false;
@Desc("The world environment") @Desc("The world environment")
private Environment environment = Environment.NORMAL; private Environment environment = Environment.NORMAL;
@RegistryListResource(IrisRegion.class) @RegistryListResource(IrisRegion.class)