mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 06:57:28 -06:00
Merge branch '4.11'
This commit is contained in:
Konstantinos Karmas
commit
e5374ada3b
3 changed files with 307 additions and 307 deletions
|
|
@ -48,8 +48,8 @@ class AuthorizationHelpers:
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
return self.parseTokenResponse(requests.post(self._token_url, data = data)) # type: ignore
|
return self.parseTokenResponse(requests.post(self._token_url, data = data)) # type: ignore
|
||||||
except requests.exceptions.ConnectionError:
|
except requests.exceptions.ConnectionError as connection_error:
|
||||||
return AuthenticationResponse(success=False, err_message="Unable to connect to remote server")
|
return AuthenticationResponse(success = False, err_message = f"Unable to connect to remote server: {connection_error}")
|
||||||
|
|
||||||
def getAccessTokenUsingRefreshToken(self, refresh_token: str) -> "AuthenticationResponse":
|
def getAccessTokenUsingRefreshToken(self, refresh_token: str) -> "AuthenticationResponse":
|
||||||
"""Request the access token from the authorization server using a refresh token.
|
"""Request the access token from the authorization server using a refresh token.
|
||||||
|
|
|
||||||
|
|
@ -468,8 +468,8 @@ class PauseAtHeight(Script):
|
||||||
|
|
||||||
#Move the head back
|
#Move the head back
|
||||||
if park_enabled:
|
if park_enabled:
|
||||||
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
|
|
||||||
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
|
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
|
||||||
|
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
|
||||||
|
|
||||||
if retraction_amount != 0:
|
if retraction_amount != 0:
|
||||||
prepend_gcode += self.putValue(G = 1, E = retraction_amount, F = 6000) + "\n"
|
prepend_gcode += self.putValue(G = 1, E = retraction_amount, F = 6000) + "\n"
|
||||||
|
|
|
||||||
|
|
@ -1,306 +1,306 @@
|
||||||
{
|
{
|
||||||
"notice": {
|
"notice": {
|
||||||
"new_icon": "Information",
|
"new_icon": "Information",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"info": {
|
"info": {
|
||||||
"new_icon": "Information",
|
"new_icon": "Information",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"plus": {
|
"plus": {
|
||||||
"new_icon": "Plus",
|
"new_icon": "Plus",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"cross1": {
|
"cross1": {
|
||||||
"new_icon": "Cancel",
|
"new_icon": "Cancel",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"application": {
|
"application": {
|
||||||
"new_icon": "UltimakerCura",
|
"new_icon": "UltimakerCura",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"printer_single": {
|
"printer_single": {
|
||||||
"new_icon": "Printer",
|
"new_icon": "Printer",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_material": {
|
"category_material": {
|
||||||
"new_icon": "Spool",
|
"new_icon": "Spool",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"new_icon": "Sliders",
|
"new_icon": "Sliders",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"plugin": {
|
"plugin": {
|
||||||
"new_icon": "Plugin",
|
"new_icon": "Plugin",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"external_link": {
|
"external_link": {
|
||||||
"new_icon": "LinkExternal",
|
"new_icon": "LinkExternal",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"arrow_top": {
|
"arrow_top": {
|
||||||
"new_icon": "ChevronSingleUp",
|
"new_icon": "ChevronSingleUp",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"arrow_bottom": {
|
"arrow_bottom": {
|
||||||
"new_icon": "ChevronSingleDown",
|
"new_icon": "ChevronSingleDown",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"arrow_right": {
|
"arrow_right": {
|
||||||
"new_icon": "ChevronSingleRight",
|
"new_icon": "ChevronSingleRight",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"pos_normal": {
|
"pos_normal": {
|
||||||
"new_icon": "Infill0",
|
"new_icon": "Infill0",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"pos_print_as_support": {
|
"pos_print_as_support": {
|
||||||
"new_icon": "MeshTypeSupport",
|
"new_icon": "MeshTypeSupport",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"pos_modify_overlaps": {
|
"pos_modify_overlaps": {
|
||||||
"new_icon": "MeshTypeIntersect",
|
"new_icon": "MeshTypeIntersect",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"pos_modify_dont_support_overlap": {
|
"pos_modify_dont_support_overlap": {
|
||||||
"new_icon": "BlockSupportOverlaps",
|
"new_icon": "BlockSupportOverlaps",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"minus": {
|
"minus": {
|
||||||
"new_icon": "Minus",
|
"new_icon": "Minus",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"load": {
|
"load": {
|
||||||
"new_icon": "Folder",
|
"new_icon": "Folder",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"extruder_button": {
|
"extruder_button": {
|
||||||
"new_icon": "Extruder",
|
"new_icon": "Extruder",
|
||||||
"size": "medium"
|
"size": "medium"
|
||||||
},
|
},
|
||||||
"category_adhesion": {
|
"category_adhesion": {
|
||||||
"new_icon": "Adhesion",
|
"new_icon": "Adhesion",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_machine": {
|
"category_machine": {
|
||||||
"new_icon": "Printer",
|
"new_icon": "Printer",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_layer_height": {
|
"category_layer_height": {
|
||||||
"new_icon": "PrintQuality",
|
"new_icon": "PrintQuality",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_shell": {
|
"category_shell": {
|
||||||
"new_icon": "PrintShell",
|
"new_icon": "PrintShell",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_topbottom": {
|
"category_topbottom": {
|
||||||
"new_icon": "PrintTopBottom",
|
"new_icon": "PrintTopBottom",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_infill": {
|
"category_infill": {
|
||||||
"new_icon": "Infill1",
|
"new_icon": "Infill1",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_speed": {
|
"category_speed": {
|
||||||
"new_icon": "SpeedOMeter",
|
"new_icon": "SpeedOMeter",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_travel": {
|
"category_travel": {
|
||||||
"new_icon": "PrintTravel",
|
"new_icon": "PrintTravel",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_cool": {
|
"category_cool": {
|
||||||
"new_icon": "Fan",
|
"new_icon": "Fan",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_support": {
|
"category_support": {
|
||||||
"new_icon": "Support",
|
"new_icon": "Support",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_dual": {
|
"category_dual": {
|
||||||
"new_icon": "DualExtrusion",
|
"new_icon": "DualExtrusion",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_fixes": {
|
"category_fixes": {
|
||||||
"new_icon": "Bandage",
|
"new_icon": "Bandage",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_blackmagic": {
|
"category_blackmagic": {
|
||||||
"new_icon": "BlackMagic",
|
"new_icon": "BlackMagic",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"category_experimental": {
|
"category_experimental": {
|
||||||
"new_icon": "Experiment",
|
"new_icon": "Experiment",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"circle_outline": {
|
"circle_outline": {
|
||||||
"new_icon": "CircleOutline",
|
"new_icon": "CircleOutline",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"update": {
|
"update": {
|
||||||
"new_icon": "ArrowDoubleCircleRight",
|
"new_icon": "ArrowDoubleCircleRight",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"checked": {
|
"checked": {
|
||||||
"new_icon": "CheckCircle",
|
"new_icon": "CheckCircle",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"warning_light": {
|
"warning_light": {
|
||||||
"new_icon": "Warning",
|
"new_icon": "Warning",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"new_icon": "Clock",
|
"new_icon": "Clock",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"spool": {
|
"spool": {
|
||||||
"new_icon": "Spool",
|
"new_icon": "Spool",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"warning": {
|
"warning": {
|
||||||
"new_icon": "Warning",
|
"new_icon": "Warning",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"check": {
|
"check": {
|
||||||
"new_icon": "Check",
|
"new_icon": "Check",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"pencil": {
|
"pencil": {
|
||||||
"new_icon": "Pencil",
|
"new_icon": "Pen",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"printing_guideline": {
|
"printing_guideline": {
|
||||||
"new_icon": "Guide",
|
"new_icon": "Guide",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"favorites_star_full": {
|
"favorites_star_full": {
|
||||||
"new_icon": "StarFilled",
|
"new_icon": "StarFilled",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"favorites_star_empty": {
|
"favorites_star_empty": {
|
||||||
"new_icon": "Star",
|
"new_icon": "Star",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"resize": {
|
"resize": {
|
||||||
"new_icon": "ThreeDots",
|
"new_icon": "ThreeDots",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"gradual": {
|
"gradual": {
|
||||||
"new_icon": "InfillGradual",
|
"new_icon": "InfillGradual",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"hollow": {
|
"hollow": {
|
||||||
"new_icon": "Infill0",
|
"new_icon": "Infill0",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"sparse": {
|
"sparse": {
|
||||||
"new_icon": "Infill3",
|
"new_icon": "Infill3",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"dense": {
|
"dense": {
|
||||||
"new_icon": "Infill2",
|
"new_icon": "Infill2",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"solid": {
|
"solid": {
|
||||||
"new_icon": "Solid",
|
"new_icon": "Solid",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"reset": {
|
"reset": {
|
||||||
"new_icon": "ArrowReset",
|
"new_icon": "ArrowReset",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"arrow_left": {
|
"arrow_left": {
|
||||||
"new_icon": "ChevronSingleLeft",
|
"new_icon": "ChevronSingleLeft",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"home": {
|
"home": {
|
||||||
"new_icon": "House",
|
"new_icon": "House",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"printer_group": {
|
"printer_group": {
|
||||||
"new_icon": "PrinterTriple",
|
"new_icon": "PrinterTriple",
|
||||||
"size": "medium"
|
"size": "medium"
|
||||||
},
|
},
|
||||||
"formula": {
|
"formula": {
|
||||||
"new_icon": "Function",
|
"new_icon": "Function",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"new_icon": "Magnifier",
|
"new_icon": "Magnifier",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"menu": {
|
"menu": {
|
||||||
"new_icon": "Hamburger",
|
"new_icon": "Hamburger",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_3d": {
|
"view_3d": {
|
||||||
"new_icon": "View3D",
|
"new_icon": "View3D",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_layer": {
|
"view_layer": {
|
||||||
"new_icon": "Layers",
|
"new_icon": "Layers",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_front": {
|
"view_front": {
|
||||||
"new_icon": "ViewFront",
|
"new_icon": "ViewFront",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_top": {
|
"view_top": {
|
||||||
"new_icon": "ViewTop",
|
"new_icon": "ViewTop",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_left": {
|
"view_left": {
|
||||||
"new_icon": "ViewLeft",
|
"new_icon": "ViewLeft",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"view_right": {
|
"view_right": {
|
||||||
"new_icon": "ViewRight",
|
"new_icon": "ViewRight",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"package": {
|
"package": {
|
||||||
"new_icon": "Plugin",
|
"new_icon": "Plugin",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"material_spool": {
|
"material_spool": {
|
||||||
"new_icon": "Spool",
|
"new_icon": "Spool",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"dot": {
|
"dot": {
|
||||||
"new_icon": "Dot",
|
"new_icon": "Dot",
|
||||||
"size": "low"
|
"size": "low"
|
||||||
},
|
},
|
||||||
"mirror": {
|
"mirror": {
|
||||||
"new_icon": "Mirror",
|
"new_icon": "Mirror",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"rotate_reset": {
|
"rotate_reset": {
|
||||||
"new_icon": "ArrowReset",
|
"new_icon": "ArrowReset",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"rotate_layflat": {
|
"rotate_layflat": {
|
||||||
"new_icon": "LayFlat",
|
"new_icon": "LayFlat",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"rotate_face_layflat": {
|
"rotate_face_layflat": {
|
||||||
"new_icon": "LayFlatOnFace",
|
"new_icon": "LayFlatOnFace",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"rotate": {
|
"rotate": {
|
||||||
"new_icon": "Rotate",
|
"new_icon": "Rotate",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"scale_reset": {
|
"scale_reset": {
|
||||||
"new_icon": "ArrowReset",
|
"new_icon": "ArrowReset",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"scale": {
|
"scale": {
|
||||||
"new_icon": "Scale",
|
"new_icon": "Scale",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
},
|
},
|
||||||
"translate": {
|
"translate": {
|
||||||
"new_icon": "ArrowFourWay",
|
"new_icon": "ArrowFourWay",
|
||||||
"size": "default"
|
"size": "default"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue