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

Merge branch '2.7'

Browse Source
This commit is contained in:
Lipu Fei 2017-08-09 16:59:56 +02:00
commit 0a76e5c38f
6 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -226,6 +226,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if definition_changes: if definition_changes:
if definition_changes[0] != instance_container: if definition_changes[0] != instance_container:
definition_changes_conflict = True definition_changes_conflict = True
elif container_type == "quality":
if not quality_name:
quality_name = instance_container.getName()
elif container_type == "user": elif container_type == "user":
num_user_settings += len(instance_container._instances) num_user_settings += len(instance_container._instances)
elif container_type in self._ignored_instance_container_types: elif container_type in self._ignored_instance_container_types:

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

@ -678,7 +678,7 @@
"minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size", "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4, "default_value": 0.4,
"value": "extruderValue(wall_0_extruder_nr, 'wall_line_width')", "value": "wall_line_width",
"type": "float", "type": "float",
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true

1
resources/variants/ultimaker3_aa0.8.inst.cfg
View File

@ -62,5 +62,6 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5 switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4 top_bottom_thickness = 1.4
wall_0_inset = 0 wall_0_inset = 0
wall_line_width_0 = =wall_line_width
wall_line_width_x = =wall_line_width wall_line_width_x = =wall_line_width
wall_thickness = 2 wall_thickness = 2

1
resources/variants/ultimaker3_bb0.8.inst.cfg
View File

@ -86,5 +86,6 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12 switch_extruder_retraction_amount = 12
top_bottom_thickness = 1 top_bottom_thickness = 1
wall_0_inset = 0 wall_0_inset = 0
wall_line_width_0 = =wall_line_width
wall_line_width_x = =wall_line_width wall_line_width_x = =wall_line_width
wall_thickness = 1 wall_thickness = 1

1
resources/variants/ultimaker3_extended_aa0.8.inst.cfg
View File

@ -62,5 +62,6 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5 switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4 top_bottom_thickness = 1.4
wall_0_inset = 0 wall_0_inset = 0
wall_line_width_0 = =wall_line_width
wall_line_width_x = =wall_line_width wall_line_width_x = =wall_line_width
wall_thickness = 2 wall_thickness = 2

1
resources/variants/ultimaker3_extended_bb0.8.inst.cfg
View File

@ -86,5 +86,6 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12 switch_extruder_retraction_amount = 12
top_bottom_thickness = 1 top_bottom_thickness = 1
wall_0_inset = 0 wall_0_inset = 0
wall_line_width_0 = =wall_line_width
wall_line_width_x = =wall_line_width wall_line_width_x = =wall_line_width
wall_thickness = 1 wall_thickness = 1