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
Jack Ha
c260078631
Remove temperature commands for pause at height for UM3. CURA-5491
2018-07-03 09:40: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
fieldOfView
7e90546163
Fix firmware upload on Windows...
...
by correctly creating a local path from a url-encoded path
Fixes #3731 and #3987
2018-06-29 10:34:15 +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
Diego Prado Gesto
6737dfac47
Protect against crashes when the temporary file is still in use by
...
another process.
Contributes to CURA-5516.
2018-06-28 16:09:00 +02:00
Diego Prado Gesto
c25a733768
Fix weights of the UMO global quality profiles.
2018-06-28 14:45:33 +02:00
Diego Prado Gesto
eca855c8c2
Merge branch '3.4'
...
Fix some conflicts. Change the weights of the global UMO profiles.
2018-06-28 14:43:39 +02:00
Diego Prado Gesto
36c25a29a8
CURA-5508 Add protection before reading a file that may not exist.
2018-06-27 11:04:53 +02:00
fieldOfView
1f7ef027ec
Clarify Profile Override preference options
2018-06-27 10:16:39 +02:00
fieldOfView
756288bbb4
Fix a bright line/gap between the viewport and sidebar due to rounding
2018-06-26 22:34:06 +02:00
Ghostkeeper
8e6b5a0d6a
Decimate UMS5 platform mesh
...
This mesh has a lot of structure underneath the build plate which can't even be seen really. We can reduce the resolution of that so that it falls under the norm of 1MB per build plate mesh that we hold for all our printers.
2018-06-26 15:56:13 +02:00
Mark
5fe812b4a4
Add downloadnumber to model and plugin view
2018-06-26 15:29:35 +02:00
fieldOfView
3546af86e8
Select the current profile when showing the profiles page
2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346
Fix color of selected items in Profiles and Materials pages
2018-06-26 11:45:07 +02:00
Mark
8c3d4f1011
Merge branch 'master' of github.com:Ultimaker/Cura
2018-06-26 11:29:46 +02:00
Mark
0f258bd680
Merge pull request #3958 from machinekoder/uni-print-3d-support
...
adding the UNI-PRINT-3D config from TheCoolTool
2018-06-26 09:29:18 +02:00
Mark
feeb00618d
Merge branch 'uni-print-3d-support' of https://github.com/machinekoder/Cura
2018-06-26 09:28:05 +02:00
Alexander Rössler
88197c4978
definitions/UNI-PRINT-3D: add to Other category
2018-06-25 20:37:25 +02:00
Aleksei S
c4fa50a8fc
Added icon for custom Menu items
2018-06-25 16:51:40 +02:00
Diego Prado Gesto
9689104a2d
CURA-5496 Change the ultimaker original profiles by removing the 0.3 and
...
adding the 0.6mm. layer heigh.
2018-06-25 15:58:13 +02:00
Diego Prado Gesto
62ca661d0e
CURA-5496 Remove wrong settings from the UM2 global profiles.
2018-06-25 15:27:53 +02:00
Lipu Fei
140e38ac1c
Fix merge conflicts
...
CURA-5496
2018-06-25 14:26:13 +02:00
