From 82bcb281e4ab88929058a607f5a517a9f7ad5543 Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Sat, 27 May 2017 08:47:34 +0200
Subject: [PATCH] solve mergeconflict
---
init.lua | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/init.lua b/init.lua
index 4f44c31..bca25ab 100644
--- a/init.lua
+++ b/init.lua
@@ -21,8 +21,8 @@ underworlds_mod.underzones = {
column_node = 'default:ice',
column_node_rare = 'underworlds:thin_ice',
floor_node = 'default:ice',
- high_chunk = -14,
- low_chunk = -16,
+ high_chunk = -22,
+ low_chunk = -25,
regular_columns = false,
stalactite = 'underworlds:icicle_down',
stalactite_chance = 12,
@@ -37,8 +37,8 @@ underworlds_mod.underzones = {
floor_node = 'underworlds:hot_cobble',
fluid = 'default:lava_source',
fluid_chance = 1200,
- high_chunk = -18,
- low_chunk = -20,
+ high_chunk = -26,
+ low_chunk = -28,
lake = 'default:lava_source',
lake_level = 5,
regular_columns = false,
@@ -53,8 +53,8 @@ underworlds_mod.underzones = {
column_node = 'default:steelblock',
floor_depth = 10,
floor_node = 'underworlds:hot_brass',
- high_chunk = -22,
- low_chunk = -22,
+ high_chunk = -30,
+ low_chunk = -30,
regular_columns = true,
stone_depth = 1,
vary = false,
@@ -67,10 +67,10 @@ underworlds_mod.underzones = {
floor_node = 'underworlds:polluted_dirt',
fluid = 'underworlds:water_poison_source',
fluid_chance = 2000,
- high_chunk = -24,
+ high_chunk = -32,
lake = 'underworlds:water_poison_source',
lake_level = 10,
- low_chunk = -26,
+ low_chunk = -35,
regular_columns = false,
stone_depth = 2,
vary = true,
@@ -79,8 +79,8 @@ underworlds_mod.underzones = {
name = 'Styx',
ceiling_node = 'default:dirt',
floor_node = 'default:dirt',
- high_chunk = -28,
- low_chunk = -32,
+ high_chunk = -36,
+ low_chunk = -40,
regular_columns = false,
stone_depth = 2,
sea_chunk = -16,
--
GitLab