Commit Graph

6 Commits

Author SHA1 Message Date
Zefram
0294fc8f3a various backward-compatibility aliases 2014-04-30 00:26:45 +01:00
Xanthin
39c41a06f4 Add german translations for all mods 2014-04-22 16:30:27 -04:00
ShadowNinja
19c9a0443b 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
2013-07-08 16:57:56 -04:00
Konstantin Oblaukhov
9de141ee6b New blocks of metal. 2013-06-27 09:13:44 +07:00
Vanessa Ezekowitz
05131f8b07 aliased diamong block back to default one. 2013-04-14 22:24:55 -04:00
RealBadAngel
279776ff62 update 2013-03-30 11:36:45 +01:00