Commit graph

22787 commits

Author SHA1 Message Date
Ghostkeeper
0e564abbea
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-03-02 14:14:51 +01:00
Ghostkeeper
4a754a0735
Realign build plate models
Contributes to issue CURA-7270.
2020-03-02 14:11:49 +01:00
Ghostkeeper
c4b060ca48
Merge branch 'dagoma_discoultimate' of https://github.com/0r31/Cura into 0r31-dagoma_discoultimate 2020-03-02 13:38:53 +01:00
Jaime van Kessel
d501f7730a
Show Full name for quit message
We're a bit insecure about Cura, so we have to put the company name in front of it ;)
2020-03-02 10:48:47 +01:00
fieldOfView
67af1aa19d Fix the positioning of multi-line tooltip anchor-points 2020-02-28 23:00:56 +01:00
fieldOfView
00f406b5dd Add list of active scripts to tooltip 2020-02-28 22:51:37 +01:00
fieldOfView
ddbd843d91 Fix showing tooltips for actionbuttons that have a tooltip text set 2020-02-28 22:31:34 +01:00
fieldOfView
0f662da2c3 Show the number of active postprocessing scripts 2020-02-28 22:29:20 +01:00
Jaime van Kessel
7c70ace8f0
Prevent crash when the start_idx could not be found
CURA-59
2020-02-28 17:06:57 +01:00
Jaime van Kessel
670a106957
Be a bit more gracefull when adding a machine failed
This seems to happen for people that manually add machines to cura
but mess something up when copying the files.

CURA-3X
2020-02-28 17:03:38 +01:00
Jaime van Kessel
27c6cb4c1e
Prevent max recursion for convex hull calculation
fixes CURA-3W
2020-02-28 16:31:28 +01:00
Jaime van Kessel
f4d1d5d936
Add a check that fixes wrong variants upon setting an active machine 2020-02-28 15:06:11 +01:00
Jaime van Kessel
3cc7382c12
Remove some unused code from TestCuraStackBuilder 2020-02-28 14:29:26 +01:00
Jaime van Kessel
0ccf457314
Split up an overly long call into shorter readable bits 2020-02-28 14:25:50 +01:00
Jaime van Kessel
68d70734ee
Skip nodes in modelchecker without active extruder
Fixes CURA-5S
2020-02-28 13:56:16 +01:00
Jaime van Kessel
e4930d3c3b
Add missing typing 2020-02-28 13:53:43 +01:00
Ghostkeeper
5e49a5fa24
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-02-28 09:47:40 +01:00
Ghostkeeper
832298e586
Merge branch 'patch-7' of https://github.com/thopiekar/Cura into thopiekar-patch-7 2020-02-28 09:37:58 +01:00
Jaime van Kessel
3958d85a9a
Revert "Prevent zip bombs in the g-codegz reader"
This reverts commit 27777c759c.
Resource isn't available on windows, so the solution won't do what needs to be done
2020-02-27 16:30:35 +01:00
Ghostkeeper
d7102729f1
Use spaces instead of tabs
And remove floating point rounding errors too.

Contributes to issue CURA-7260.
2020-02-27 10:57:15 +01:00
Ghostkeeper
f6bc220faa
Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master
Conflicts:
	resources/definitions/skriware_2.def.json -> On master the old setting value was changed to 'value' rather than 'default_value', while on this branch the value was changed to use the resolve function.
2020-02-27 10:54:31 +01:00
Jaime van Kessel
1a44aa6d2e
Ignore comments when checking for temperature prepends
Fixes #7124
2020-02-27 10:47:32 +01:00
konskarm
ba0eb114f6
Merge pull request #7164 from Ultimaker/Hrybmo-master
Update to ColorMix.py script
2020-02-27 09:33:10 +01:00
Tim Kuipers
0f4ff1f149 lil: fix naming and spacing to fit code conventions 2020-02-26 15:37:25 +01:00
Tim Kuipers
14d351e185 Merge branch 'master' of https://github.com/Hrybmo/Cura into Hrybmo-master 2020-02-26 15:31:58 +01:00
Ghostkeeper
d84bc5c682
Also check if streams are not closed
SmartAvionics found that this was a safer way to be able to write to these streams.

See comments on commit 2eab2c0f3d.
2020-02-26 13:48:27 +01:00
Nino van Hooff
7e2177a8cd Rename _loginStateChanged for consistency
CURA-7251
2020-02-25 16:25:03 +01:00
Nino van Hooff
cf689ee3b0 Hide the Cloud Sync message when the user logs out
CURA-7251
2020-02-25 16:21:06 +01:00
Ghostkeeper
b2ab5d98cb
Merge branch '4.5' 2020-02-25 16:17:10 +01:00
Ghostkeeper
15a7d0842d
Fix layout of 4.5 change log
Contributes to issue CURA-7250.
2020-02-25 16:16:45 +01:00
Ghostkeeper
92e6141765
Merge branch '4.5' 2020-02-25 15:29:16 +01:00
Ghostkeeper
43ced914fd
Add change log entries for Cura 4.5
Contributes to issue CURA-7250.
2020-02-25 15:28:48 +01:00
Ghostkeeper
3dbbd17e32
Round coordinates
This would have worked out of the box if this plug-in actually used the theme rather than hard-coding its sizes here. However that is too big of a change for me to make in 5 minutes, so it'll have to wait. Also fixed some missing screen scale factors.

Done as a 5 minute fix to try to amend #7125.
2020-02-25 15:00:41 +01:00
Ghostkeeper
b4a646c191
Make warning values for support interface depend on Z distance
Rather than a hard-coded 0.2mm. The point of these is to ensure that there is always one layer.
2020-02-25 14:42:11 +01:00
Ghostkeeper
dba35dc664
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-02-25 14:34:36 +01:00
Remco Burema
510d9822dd
Merge pull request #7153 from Ultimaker/CURA-7066_gcode_reader_line_width_fix
Cura 7066 gcode reader line width fix
2020-02-25 13:45:07 +01:00
Ghostkeeper
a1438e91d0
Merge branch '4.5'
Conflicts:
	cura_app.py -> Due to moving some imports around.
2020-02-25 12:07:47 +01:00
Dimitriovski
2b11152c4d
Added a comment(explanation) to an unused code of the Toolbox. 2020-02-25 12:06:11 +01:00
Ghostkeeper
4db66c71ba
Uncomment old translation for 'do not show again'
We re-added this string after the string freeze.

Contributes to issue CURA-7231.
2020-02-25 12:04:26 +01:00
Nino van Hooff
d762ad4acc
Merge pull request #7156 from Ultimaker/CURA-7231_no_layers_to_show_msg
Cura 7231 no layers to show msg
2020-02-25 09:42:23 +01:00
Tim Kuipers
70a95e68d6
Merge pull request #7122 from Ultimaker/CURA-7223/remove_crashHandler
CURA-7223/Removed the user input from the CrashHandler as we are not using it f…
2020-02-24 22:22:37 +01:00
Jaime van Kessel
1b65e47bea
Move imports of Arcus & Savitar up
This was needed due to the crashhandler being imported

CURA-7245
2020-02-24 17:08:19 +01:00
Jaime van Kessel
77f0ff588f
Merge branch 'CURA-7245_sentry_prune_more_user_data' of github.com:Ultimaker/Cura into 4.5 2020-02-24 17:01:29 +01:00
Ghostkeeper
43e373af02
Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master 2020-02-24 17:00:12 +01:00
Jaime van Kessel
9c0e6f9338
Apply suggestions from code review
Codestyle!
2020-02-24 16:57:37 +01:00
Nino van Hooff
94e9753b6c Update cura/CrashHandler.py
Import Any and re-order if-statements for efficiency

CURA-7245
2020-02-24 16:26:32 +01:00
Nino van Hooff
2cd6149ef0
Update cura/CrashHandler.py
Add typing to pruneSensitiveData

Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2020-02-24 16:14:12 +01:00
Nino van Hooff
62dfadecdf Prune all sensitive data before sending it to Sentry
CURA-7245
2020-02-24 15:27:17 +01:00
Tim Kuipers
9bcae15d39 lil: optimize parsing gcode arg letter
CURA-7066
2020-02-24 14:56:06 +01:00
Tim Kuipers
efafc37e49 fix E-values after G92 when parsing gcode
CURA-7066
2020-02-24 14:55:58 +01:00