Commit graph

22028 commits

Author SHA1 Message Date
Lipu Fei
fb33497ff1 Fix auto-slice for per-object settings
CURA-6539
2019-05-23 11:36:55 +02:00
maukcc
6af43f6497 HMS434 update
gantry height set
2019-05-23 11:18:53 +02:00
maukcc
27837feb73 HMS434 update
start gcode update
2019-05-23 11:14:12 +02:00
maukcc
86cb9c2f99 HMS434 update
HMS434 multi tool update
2019-05-23 11:02:11 +02:00
Lipu Fei
5b7b262d61 Merge remote-tracking branch 'origin/4.1' 2019-05-23 10:53:24 +02:00
Lipu Fei
50e4519298 Fix upgrade 40 to 41 2019-05-23 10:46:14 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug
CL-1329 fix monitor progress bar bug
2019-05-21 17:27:53 +02:00
Lipu Fei
5d58d60a16 Fix typing
CURA-6283
2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b Change import
CURA-6182
2019-05-21 15:17:04 +02:00
Lipu Fei
c9642273eb Fix typing
CURA-6283
2019-05-21 15:15:18 +02:00
Jaime van Kessel
9e6263b1f1 Change instances of assert_called_once to assert_called_once_with
Grumbles something about python 3.5 and 3.6...
2019-05-21 14:56:00 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming
CURA-6283

For both individual nodes and grouped nodes.
2019-05-21 14:49:45 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Jaime van Kessel
65a8582a1e Add preference to set the camera rendering type
CURA-5395
2019-05-21 09:54:32 +02:00
Lipu Fei
9187738d9c
Merge pull request #4599 from DesktopMetal/feature_nozzle_switch_extra_prime_distance
Feature: "Nozzle Switch Extra Prime Distance"
2019-05-21 09:18:11 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode
CURA-6182

Move complex logic to Python.
2019-05-21 08:10:49 +02:00
Tim Kuipers
e59641eb67 based transmittance on measurements on print
ratio of luminance of 1.4mm thickness to luminance at 0.4mm
2019-05-20 20:19:29 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function
CURA-5395
2019-05-20 16:34:24 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button
CL-1259 hide useless override button
2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml
Contributes to CL-1259
2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 15:46:07 +02:00
Ghostkeeper
b52b6251b9
Clarify description of build volume temperature a bit
Contributes to #5756.
2019-05-20 15:35:53 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:12:08 +02:00
Tim Kuipers
236b7574c0 fix litho thickness computation 2019-05-20 14:58:26 +02:00
Jaime van Kessel
919420c47a Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-20 14:41:19 +02:00
Jaime van Kessel
f7d0bcd0d4 Prevent modifier meshes from blocking one at a time slicing
CURA-6030
2019-05-20 14:40:41 +02:00
Tim Kuipers
3e0b756a6d explain litho transmittance better 2019-05-20 14:37:14 +02:00
Ghostkeeper
cdda24b33a
Merge branch '4.1' 2019-05-20 14:30:47 +02:00
Ghostkeeper
9a9f584285
Reduce jerk for Creality printers
As tested by our community.

Fixes #5694.
2019-05-20 14:30:29 +02:00
Tim Kuipers
5b9a18f5df make naming of Logarithmic Conversion Function intelligible 2019-05-20 14:27:51 +02:00
Tim Kuipers
beaa5e0b7a fix luminance computation 2019-05-20 14:22:27 +02:00
Tim Kuipers
9066f5f6d4 fix translucency model using new permittance setting 2019-05-20 14:22:19 +02:00
Ghostkeeper
b64f2f1d8f
Remove override for outer wall line width
This way the outer wall line width adjusts automatically to the user's value for the wall line width, if he chooses to change that.
2019-05-20 13:56:57 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Ghostkeeper
70609d2764
Merge branch 'DragonJe-4.1' into 4.1 2019-05-20 13:42:21 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name
CURA-6497 Add validation for empty strings in SettingDefinition
2019-05-20 13:40:39 +02:00
Ghostkeeper
127a5e4faa
Merge branch '4.1' of https://github.com/DragonJe/Cura into DragonJe-4.1 2019-05-20 13:39:09 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +02:00
Vlad Gribinchuk
055dcddd1e Change switch_extruder_extra_prime_amount setting to be more consistent with other 2019-05-20 14:35:27 +03:00
Ghostkeeper
2ada8cec72
Cast autosave delay preference to int
Oops. How long has this been in there, you think? At least 3 years.
As seen in #5729, when changing this preference it results in an error that it can't set the interval to a string. The default is an integer, so if you don't edit it it works fine, but if you edited the preferences file, it gets a string from the preferences file. Casting both to an int should work.
2019-05-20 13:33:33 +02:00
Tim Kuipers
3168328750 feat: use logarithmic conversion for lithophanes 2019-05-20 13:10:54 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml
Contributes to CL-1329
2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme
Contributes to CL-1329
2019-05-20 12:18:38 +02:00
Tim Kuipers
ba878ccff0 fix luminance computation 2019-05-20 12:08:16 +02:00
Jaime van Kessel
26db08048b Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 11:03:38 +02:00
Jaime van Kessel
7d8c97dd7b ChangeAtZ no longer sets flow to -1 if no previous flow was found
It makes a lot more sense to just asume the value is 100 than -1

Fixes #5284
2019-05-20 11:02:40 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden
Contributes to CL-1259
2019-05-20 10:59:51 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 10:59:34 +02:00