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

Merge branch '4.11'

Browse source
This commit is contained in:
Konstantinos Karmas 2021-08-17 15:59:53 +02:00
commit e5374ada3b
3 changed files with 307 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/OAuth2/AuthorizationHelpers.py
View file

@ -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.

2
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -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"

2
resources/themes/cura-light/icons/deprecated_icons.json
View file

@ -168,7 +168,7 @@
"size": "default" "size": "default"
}, },
"pencil": { "pencil": {
"new_icon": "Pencil", "new_icon": "Pen",
"size": "default" "size": "default"
}, },
"printing_guideline": { "printing_guideline": {