3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into TIme-Lapse

Browse source
This commit is contained in:
Jelle Spijker 2024-05-14 00:21:03 +02:00 • committed by GitHub
commit 1a95cd39ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
152 changed files with 17737 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py
View file

@ -26,27 +26,40 @@ class InsertAtLayerChange(Script):
},
"gcode_to_add":
{
"label": "G-code to insert.",
"label": "G-code to insert",
"description": "G-code to add before or after layer change.",
"type": "str",
"default_value": ""
},
"skip_layers":
{
"label": "Skip layers",
"description": "Number of layers to skip between insertions (0 for every layer).",
"type": "int",
"default_value": 0,
"minimum_value": 0
}
}
}"""
def execute(self, data):
gcode_to_add = self.getSettingValueByKey("gcode_to_add") + "\n"
skip_layers = self.getSettingValueByKey("skip_layers")
count = 0
for layer in data:
# Check that a layer is being printed
lines = layer.split("\n")
for line in lines:
if ";LAYER:" in line:
index = data.index(layer)
if self.getSettingValueByKey("insert_location") == "before":
layer = gcode_to_add + layer
else:
layer = layer + gcode_to_add
if count == 0:
if self.getSettingValueByKey("insert_location") == "before":
layer = gcode_to_add + layer
else:
layer = layer + gcode_to_add
data[index] = layer
data[index] = layer
count = (count + 1) % (skip_layers + 1)
break
return data

5
plugins/SimulationView/layers3d.shader
View file

@ -356,7 +356,10 @@ geometry41core =
EndPrimitive();
}
if ((u_show_starts == 1) && (v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) {
if ((u_show_starts == 1) && (
((v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) ||
((v_prev_line_type[0] != 4) && (v_line_type[0] == 4))
)) {
float w = size_x;
float h = size_y;

BIN
plugins/UM3NetworkPrinting/resources/png/Ultimaker Factor 4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 874 KiB

3
plugins/UM3NetworkPrinting/src/Cloud/machine_id_to_name.json
View file

@ -1,5 +1,6 @@
{
"ultimaker_method": "MakerBot Method",
"ultimaker_methodx": "MakerBot Method X",
"ultimaker_methodxl": "MakerBot Method XL"
"ultimaker_methodxl": "MakerBot Method XL",
"ultimaker_factor4": "Ultimaker Factor 4"
}

1
plugins/XmlMaterialProfile/product_to_id.json
View file

@ -6,6 +6,7 @@
"Ultimaker #+": "ultimaker#_plus",
"Ultimaker #+ Connect": "ultimaker#_plus_connect",
"Ultimaker S#": "ultimaker_s#",
"Ultimaker Factor #": "ultimaker_factor#",
"Ultimaker Original": "ultimaker_original",
"Ultimaker Original+": "ultimaker_original_plus",
"Ultimaker Original Dual Extrusion": "ultimaker_original_dual",