nalc/technic
1
0
Fork 0
forked from minetest-mods/technic
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'indev'

Browse Source 
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
This commit is contained in:
ShadowNinja
2013-07-08 16:53:44 -04:00
parent 3a3700537b 79e8d26989
commit 19c9a0443b
72 changed files with 4755 additions and 3178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
technic_worldgen/depends.txt
View File

@ -1 +1,2 @@
default
technic

2
technic_worldgen/nodes.lua
View File

@ -96,3 +96,5 @@ minetest.register_craft({
{'technic:marble','technic:marble'}
}
})
minetest.register_alias("technic:diamond_block", "default:diamondblock")

4
technic_worldgen/oregen.lua
View File

@ -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