GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 18:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-backup-manager

Browse Source
This commit is contained in:
ChrisTerBeke 2018-05-16 17:55:56 +02:00
commit da94a5afb1
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/CuraPackageManager.py
View File

@ -338,13 +338,7 @@ class CuraPackageManager(QObject):
with zipfile.ZipFile(filename) as archive:
# Go through all the files and use the first successful read as the result
for file_info in archive.infolist():
is_dir = lambda file_info: file_info.filename.endswith('/')
if is_dir or not file_info.filename.startswith("files/"):
continue
filename_parts = os.path.basename(file_info.filename.lower()).split(".")
stripped_filename = filename_parts[0]
if stripped_filename in ("license", "licence"):
if file_info.filename.endswith("LICENSE"):
Logger.log("d", "Found potential license file '%s'", file_info.filename)
try:
with archive.open(file_info.filename, "r") as f:

21
resources/definitions/fdmprinter.def.json
View File

@ -5772,6 +5772,27 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"cross_infill_density_image":
{
"label": "Cross Infill Density Image",
"description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the infill of the print.",
"type": "str",
"default_value": "",
"enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"cross_support_density_image":
{
"label": "Cross Fill Density Image for Support",
"description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support.",
"type": "str",
"default_value": "",
"enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"spaghetti_infill_enabled":
{
"label": "Spaghetti Infill",