diff options
| author | ShadowNinja <noreply@gmail.com> | 2013-07-08 16:53:44 -0400 |
|---|---|---|
| committer | ShadowNinja <noreply@gmail.com> | 2013-07-08 16:57:56 -0400 |
| commit | 19c9a0443b17176a27329b69ee16fe28d7be6fd8 (patch) | |
| tree | 9125c9ca38798426a1bf01a247e98bb532ec9b6b /technic_worldgen | |
| parent | 3a3700537baa748e459258385d27bb79ab391546 (diff) | |
| parent | 79e8d26989cf20108bc69cf3b1da32655d57735a (diff) | |
Merge branch 'indev'
Conflicts:
technic/alloy_furnace.lua
technic/alloy_furnaces_commons.lua
technic/battery_box.lua
technic/battery_box_hv.lua
technic/battery_box_mv.lua
technic/chainsaw.lua
technic/cnc.lua
technic/cnc_nodes.lua
technic/electric_furnace.lua
technic/grinder.lua
technic/init.lua
technic/solar_array_hv.lua
technic/solar_array_lv.lua
technic/solar_array_mv.lua
technic/solar_panel.lua
unified_inventory/api.lua
unified_inventory/depends.txt
Diffstat (limited to 'technic_worldgen')
| -rw-r--r-- | technic_worldgen/depends.txt | 1 | ||||
| -rw-r--r-- | technic_worldgen/nodes.lua | 2 | ||||
| -rw-r--r-- | technic_worldgen/oregen.lua | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index 4ad96d5..d684218 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1 +1,2 @@ default +technic diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index 53fd738..7b9d385 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -96,3 +96,5 @@ minetest.register_craft({ {'technic:marble','technic:marble'} } }) + +minetest.register_alias("technic:diamond_block", "default:diamondblock") diff --git a/technic_worldgen/oregen.lua b/technic_worldgen/oregen.lua index b17e438..50f5415 100644 --- a/technic_worldgen/oregen.lua +++ b/technic_worldgen/oregen.lua @@ -28,6 +28,7 @@ minetest.register_ore({ height_min = -31000, height_max = 2, }) +if technic.config:getBool("enable_marble_generation") then minetest.register_ore({ ore_type = "sheet", ore = "technic:marble", @@ -40,6 +41,8 @@ minetest.register_ore({ noise_threshhold = 0.4, noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70} }) +end +if technic.config:getBool("enable_granite_generation") then minetest.register_ore({ ore_type = "sheet", ore = "technic:granite", @@ -52,4 +55,5 @@ minetest.register_ore({ noise_threshhold = 0.4, noise_params = {offset=0, scale=15, spread={x=130, y=130, z=130}, seed=24, octaves=3, persist=0.70} }) +end |