minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2025-06-30 15:20:37 +02:00
Code Issues 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

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")