Diego Prado Gesto
|
7d7a51d772
|
Fix code-style in CuraEngineBackend
|
2018-07-05 08:04:19 +02:00 |
|
Diego Prado Gesto
|
efb9fcb645
|
Merge branch '3.4'
|
2018-07-04 17:28:08 +02:00 |
|
Diego Prado Gesto
|
ed882b917e
|
Merge branch 'check_before_install_packages' into 3.4
|
2018-07-04 17:20:03 +02:00 |
|
Diego Prado Gesto
|
d7c1767a23
|
Merge branch '3.4' into check_before_install_packages
|
2018-07-04 17:12:46 +02:00 |
|
Diego Prado Gesto
|
8e9ded98e4
|
Merge branch '3.4'
|
2018-07-04 14:57:43 +02:00 |
|
Lipu Fei
|
2b5700e4e1
|
Check the package file before installing it
Make sure that the package file is there before we remove the existing
installed files.
|
2018-07-04 14:50:32 +02:00 |
|
Diego Prado Gesto
|
4fd4043706
|
CURA-5528 Make the variable remove_failures a set.
|
2018-07-04 14:39:01 +02:00 |
|
Diego Prado Gesto
|
3b406b5467
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2018-07-04 14:32:05 +02:00 |
|
Diego Prado Gesto
|
4722b5387b
|
CURA-5334 Add extruder definition for Wanhao printers, Uni Print 3d and
Tevo Tornado. Those definitions were added without extruder definitions.
|
2018-07-04 14:22:22 +02:00 |
|
Ian Paschal
|
d4aaec7355
|
CURA-5537 Style improvements
|
2018-07-04 12:51:01 +02:00 |
|
Diego Prado Gesto
|
5b251fc6dc
|
CURA-5334 Remove machine nozzle size from machine definitions and move
it to extruder definitions.
|
2018-07-04 12:00:38 +02:00 |
|
Ian Paschal
|
7d30cee205
|
Revert "Add dummy details for when there is no selection"
This reverts commit 2e3528d9b25b7b3a76cdbb145de955b5d1826bd2.
|
2018-07-04 11:36:56 +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 |
|