Ghostkeeper
8f8c515438
Fix bug when default_extruder_nr is not provided
...
Then this would not slice because of a KeyError that is not caught.
Contributes to issue CURA-5457.
2018-07-05 12:51:27 +02:00
Ghostkeeper
ef2250b889
Don't check if keys are str
...
Our type checking should take care of that.
2018-07-05 12:31:42 +02:00
Ghostkeeper
807e8410c0
Give warning when sum of volumes exceeds volume of prime tower
...
It could happen that the desired volume is not entirely reached in the inner shells because of rounding the volume up to the nearest perimeter on the outer shells.
Contributes to issue CURA-5457.
2018-07-05 10:31:23 +02:00
Ghostkeeper
192a581d6d
Don't round the warning threshold
...
The threshold is not visible. It's not necessary to round.
Contributes to issue CURA-5457.
2018-07-05 09:50:05 +02:00
Ghostkeeper
8ff4327c41
Remove Wipe Nozzle After Switch and Purge Volume settings
...
The entire purging algorithm is gone now since it purges by printing the prime tower. The prime tower should be sufficiently strong now to not need this.
Contributes to issue CURA-5457.
2018-07-04 14:17:57 +02:00
Ghostkeeper
7b2a5c9160
Remove prime_tower_wall_thickness setting
...
The wall thickness now depends on the order in which the prime towers are folded, which is really hard to obtain within an inheritance formula. So we forego one of the settings and compute the required thickness to obtain the desired volume in the engine where the shell order is known.
Contributes to issue CURA-5457.
2018-07-04 13:45:44 +02:00
Diego Prado Gesto
715eda4f59
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 17:57:45 +02:00
Diego Prado Gesto
f91b6faecc
Fix code-styling
2018-07-03 17:57:30 +02:00
Lipu Fei
5f2cbd4440
Merge pull request #4015 from Ultimaker/CURA-5537_toolbox_style_improvements
...
CURA-5537 improve styling of toolbox
2018-07-03 16:05:51 +02:00
Lipu Fei
2e3528d9b2
Add dummy details for when there is no selection
...
CURA-5521
2018-07-03 15:58:54 +02:00
Ian Paschal
bc05839940
CURA-5537 improve styling of toolbox
2018-07-03 15:54:20 +02:00
Diego Prado Gesto
9fa8498162
Fix code-style in MaterialManager
2018-07-03 13:25:39 +02:00
Diego Prado Gesto
8633d75751
Fix error introduced when fixing code-style
2018-07-03 13:14:40 +02:00
Diego Prado Gesto
ff6bc9de4e
Fix some more code-style
2018-07-03 13:09:05 +02:00
Diego Prado Gesto
ae7875a756
Revert changes in run_mypy script by mistake
2018-07-03 12:09:01 +02:00
Diego Prado Gesto
7714515204
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 12:06:23 +02:00
Diego Prado Gesto
762a1b1bfd
Fix code-style
2018-07-03 12:06:06 +02:00
Lipu Fei
293b803dd3
Fix preferences upgrade in 3.4 to 4.0
2018-07-03 10:40:57 +02:00
Diego Prado Gesto
e983a9a9e7
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 10:40:00 +02:00
Diego Prado Gesto
3c57068cf4
CURA-5034 Fix a typo in the method call.
2018-07-03 10:38:44 +02:00
Aleksei S
47300eabe7
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-03 10:24:17 +02:00
Aleksei S
7b63dc7b10
Changed machine and extruder_train version in VersionUpgrade 34to40
2018-07-03 10:17:42 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact
...
Fix a bright line/gap between the viewport and sidebar due to rounding
2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask
...
Clarify Profile Override preference options
2018-07-02 16:43:20 +02:00
Mark
c0e97b9529
Merge branch '3.4'
2018-07-02 16:37:04 +02:00
Jack Ha
7058ddbb66
Corrected float/int mixups and allow catching temperature before the layers start. CURA-5491
2018-07-02 16:35:49 +02:00
Mark
c6b31b3b0c
Merge pull request #3901 from fieldOfView/fix_toolbox_flicking
...
Limit flicking the Toolbox scrollviews to vertical only
2018-07-02 16:35:45 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all
...
CURA-5334 Add extruder definitions for all single-extrusion machines
2018-07-02 15:56:45 +02:00
Jack Ha
a283dd1d94
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-02 15:14:14 +02:00
Jack Ha
17c4b65453
Fix pause at height that uses new latest temperature CURA-5491
2018-07-02 15:13:44 +02:00
Jack Ha
e11ce2674f
CURA-5334 formatting
2018-07-02 15:10:27 +02:00
Aleksei S
914b3a648b
Added setting for initial layer support distance
...
CURA-5527
2018-07-02 14:21:13 +02:00
Jack Ha
3761123513
Merge branch 'master' into CURA-5334_extruder_def_for_all
2018-07-02 14:11:24 +02:00
Ian Paschal
68e1b58c89
Merge pull request #3925 from Ultimaker/feature_send_material_profiles
...
Send material profiles via wifi
2018-07-02 13:54:38 +02:00
Ian Paschal
adc7fc58e9
Fixed method naming conflict
2018-07-02 13:53:35 +02:00
Jack Ha
e842ca37fb
CURA-5334 adding more material_diameter properties
2018-07-02 13:48:21 +02:00
Jack Ha
5aba2e4b90
CURA-5334 corrected extruders that didn't have a material_diameter yet
2018-07-02 13:38:18 +02:00
Diego Prado Gesto
057685e8ea
Merge branch '3.4'
2018-07-02 13:14:55 +02:00
Ian Paschal
680e98fb28
Removed duplicate '.self'
2018-07-02 13:11:01 +02:00
Diego Prado Gesto
77e7a99d09
CURA-5528 Prevent crashes when there is a problem deleting some files in
...
a package.
2018-07-02 13:08:51 +02:00
Ian Paschal
b55abee783
Code style did not rename this variable
2018-07-02 13:05:22 +02:00
Ian Paschal
8f7370db6c
Merge remote-tracking branch 'origin/master' into feature_send_material_profiles
2018-07-02 12:37:56 +02:00
Diego Prado Gesto
0692192d58
Merge branch '3.4'
2018-07-02 09:10:57 +02:00
Ian Paschal
b00502d10f
Merge pull request #4001 from Ultimaker/mypy_fixes
...
Fix typing
2018-06-29 15:58:28 +02:00
Diego Prado Gesto
ee2dfffb84
Merge pull request #3977 from fieldOfView/fix_preference_pages
...
Fixes for preference pages
2018-06-29 15:00:39 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes
2018-06-29 13:45:55 +02:00
Diego Prado Gesto
56c7c6f2b2
CURA-5518 Check whether the the findDefinitionContainers return any
...
element or not.
2018-06-29 10:41:54 +02:00
Jaime van Kessel
b4f59a7822
Removed unneeded application reference in construction of meshreaders
2018-06-29 09:25:38 +02:00
Ghostkeeper
2b83af2497
Move initialization into Uranium's run() function
...
This makes it possible to start a Uranium-based application without needing to know the magic incantation of starting the application.
2018-06-28 21:41:16 +02:00
Ghostkeeper
0cb6e506d2
Rewrite code style of _getScaleFromUnit
...
It should be much more readable now.
Discovered while investigating #3847 .
2018-06-28 16:39:53 +02:00