GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-28 23:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.8' of https://github.com/Ultimaker/Cura into 4.8

Browse Source
This commit is contained in:
Kostas Karmas 2020-11-04 09:22:42 +01:00
commit 726175a01d
13 changed files with 256 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/CuraApplication.py
View File

@ -1901,9 +1901,10 @@ class CuraApplication(QtApplication):
if select_models_on_load:
Selection.add(node)
try:
arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes)
except:
Logger.logException("e", "Failed to arrange the models")
self.fileCompleted.emit(file_name)
def addNonSliceableExtension(self, extension):

3
plugins/SliceInfoPlugin/SliceInfo.py
View File

@ -125,7 +125,8 @@ class SliceInfo(QObject, Extension):
data["schema_version"] = 0
data["cura_version"] = self._application.getVersion()
data["cura_build_type"] = ApplicationMetadata.CuraBuildType
data["organization_id"] = user_profile.get("organization_id", None) if user_profile else None
org_id = user_profile.get("organization_id", None) if user_profile else None
data["organization_id"] = org_id if org_id else None
data["subscriptions"] = user_profile.get("subscriptions", []) if user_profile else []
active_mode = self._application.getPreferences().getValue("cura/active_mode")

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

@ -124,7 +124,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" },

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

@ -235,7 +235,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },

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

@ -139,7 +139,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },

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

@ -238,7 +238,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },

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

@ -75,6 +75,6 @@
"adhesion_type": { "default_value": "skirt" },
"brim_outside_only": { "default_value": false },
"meshfix_maximum_resolution": { "default_value": 0.05 }
"meshfix_maximum_resolution": { "default_value": 0.25 }
}
}

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

@ -250,7 +250,7 @@
"brim_replaces_support": { "value": false },
"brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" },
"meshfix_maximum_resolution": { "value": 0.05 },
"meshfix_maximum_resolution": { "value": 0.25 },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"adaptive_layer_height_variation": { "value": 0.04 },

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

@ -55,7 +55,7 @@
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
"cool_fan_enabled":{ "value":true },
"cool_min_layer_time":{ "value":10 },
"meshfix_maximum_resolution":{ "value":"0.05" },
"meshfix_maximum_resolution":{ "value":"0.25" },
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
"skirt_gap":{ "value":5.0 },

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

@ -55,7 +55,7 @@
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
"cool_fan_enabled":{ "value":true },
"cool_min_layer_time":{ "value":10 },
"meshfix_maximum_resolution":{ "value":"0.05" },
"meshfix_maximum_resolution":{ "value":"0.25" },
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
"skirt_gap":{ "value":5.0 },

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

@ -28,7 +28,7 @@
"expand_skins_expand_distance":{"value":0.8},
"fill_outline_gaps":{"default_value":false},
"infill_sparse_density":{"value":15},
"meshfix_maximum_resolution":{"value":0.05},
"meshfix_maximum_resolution":{"value":0.25},
"optimize_wall_printing_order":{"value":true},
"retract_at_layer_change":{"value":false},
"retraction_amount":{"value":4.5},

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

@ -243,7 +243,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },

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

@ -138,7 +138,7 @@
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_resolution": { "value": "0.25" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },