Merge branch 'master' into simple-mode

This commit is contained in:
Alessandro Ranellucci 2013-03-08 22:28:13 +01:00
commit b901e1f6c8
48 changed files with 1711 additions and 711 deletions

View file

@ -18,7 +18,7 @@ use constant FILE_WILDCARDS => {
obj => 'OBJ files (*.obj)|*.obj;*.OBJ',
amf => 'AMF files (*.amf)|*.amf;*.AMF;*.xml;*.XML',
ini => 'INI files *.ini|*.ini;*.INI',
gcode => 'G-code files *.gcode|*.gcode;*.GCODE|G-code files *.g|*.g;*.G',
gcode => 'G-code files (*.gcode, *.gco, *.g)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G',
svg => 'SVG files *.svg|*.svg;*.SVG',
};
use constant MODEL_WILDCARD => join '|', @{&FILE_WILDCARDS}{qw(stl obj amf)};