Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits

Removes color-whitelist blocking custom-colored circuit blueprints from being imported
This commit is contained in:
kevinz000
2019-05-27 03:30:07 -07:00
committed by GitHub
@@ -124,7 +124,7 @@
// Save modified name
if(initial(name) != name)
assembly_params["name"] = name
// Save modified description
if(initial(desc) != desc)
assembly_params["desc"] = desc
@@ -144,7 +144,7 @@
return "Bad assembly name."
if(assembly_params["desc"] && !reject_bad_text(assembly_params["desc"]))
return "Bad assembly description."
if(assembly_params["detail_color"] && !(assembly_params["detail_color"] in color_whitelist))
if(assembly_params["detail_color"] && !reject_bad_text(assembly_params["detail_color"], 7))
return "Bad assembly color."
// Loads assembly parameters from a list
@@ -153,7 +153,7 @@
// Load modified name, if any.
if(assembly_params["name"])
name = assembly_params["name"]
// Load modified description, if any.
if(assembly_params["desc"])
desc = assembly_params["desc"]