Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-03-25 00:11:39 +01:00
committed by GitHub
137 changed files with 2726 additions and 1478 deletions
@@ -68,11 +68,8 @@
if(stat & NOPOWER)
icon_state = "[reference]w"
return
else if(use_power)
if(assembled)
icon_state = "[reference]p"
else
icon_state = "u[reference]p"
else if(use_power && assembled)
icon_state = "[reference]p"
else
switch(construction_state)
if(0)