Mark Burton
cfea12ab25
Fix dimensions of print job information popup when using Qt 5.13.
...
Remains compatible with Qt 5.10.
2019-07-24 20:35:39 +01:00
Jaime van Kessel
004297b936
Merge pull request #6028 from sgtnoodle/stretch_retract
...
Preserve extruder-only moves in post stretch script
2019-07-24 17:05:41 +02:00
Lipu Fei
73b7bc3172
Remove verobse flags for pytest
2019-07-24 11:38:10 +02:00
Lipu Fei
80bf8c22ee
Merge remote-tracking branch 'origin/4.2'
2019-07-24 10:56:48 +02:00
Lipu Fei
33739ea7a8
Fix profile upgrade in profile importing
...
CURA-6681
2019-07-24 10:55:38 +02:00
Jaime van Kessel
36159116fa
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-24 10:30:26 +02:00
Jaime van Kessel
bc7c4d61f8
Mark test that only fails on CI server as to be skipped for the moment
2019-07-24 09:56:49 +02:00
Jaime van Kessel
e630cb3480
Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura
2019-07-24 09:53:51 +02:00
Jaime van Kessel
0bf683d7b9
Set maximum value of the build_volume_temperature of the s5 to 50
...
CURA-6680
2019-07-23 17:48:43 +02:00
Diego Prado Gesto
8411d43ecd
Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura into fixes_toolbox
2019-07-23 16:19:21 +02:00
Diego Prado Gesto
46e6baf6ae
Make suggested changes
...
Add anchors instead of using width
Contributes to CURA-6518.
2019-07-23 16:17:54 +02:00
Jaime van Kessel
3e5d81ddb6
Merge branch 'patch-2' of https://github.com/adecastilho/Cura
2019-07-23 15:48:57 +02:00
Jaime van Kessel
5e94e51e0c
Add default for max_layer setting in postprocessing script
2019-07-23 15:36:04 +02:00
Jaime van Kessel
a330ae12dc
Merge branch 'patch-2' of https://github.com/N95JPL/Cura
2019-07-23 15:28:32 +02:00
Jaime van Kessel
23e295e9e7
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-23 15:26:13 +02:00
Diego Prado Gesto
1d6ba3ffb0
Merge branch 'master' into fixes_toolbox
2019-07-23 15:15:02 +02:00
Jaime van Kessel
42abece298
Fix crash when a corrupted and unkown message was returned
...
This is should be pretty rare, but we got a single crash report for it.
2019-07-23 14:54:40 +02:00
Jaime van Kessel
450302071f
Simplified the dark & light theme for colorblindness
2019-07-23 14:19:21 +02:00
Jaime van Kessel
dd2ddbc71b
Merge branch 'master' of https://github.com/nubnubbud/Cura
2019-07-23 14:12:16 +02:00
Jaime van Kessel
757988a7f4
Merge branch 'master' of github.com:Ultimaker/Cura into fixes_toolbox
2019-07-23 14:04:40 +02:00
Jaime van Kessel
1e7875de48
Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura
2019-07-23 13:57:31 +02:00
Jaime van Kessel
87666eb6a1
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091
Fix typing ignore for breath frist iterator
2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2'
2019-07-23 13:33:58 +02:00
Ghostkeeper
5f74ed080f
Increment SDK version to 6.2
2019-07-23 13:32:48 +02:00
Jaime van Kessel
0077e022ce
Renamed some small test classes so they don't cause pytest warnings
...
Pytest thought that they were tests, since their name started with test
2019-07-23 13:24:39 +02:00
Jaime van Kessel
827ccd5a13
Fix mypy issues caused by scenenode iterator being correctly typed
2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b
Fix typing issues
...
They were caused by upgrading to a higher mypy version, which found more mistakes
2019-07-23 12:58:46 +02:00
Ian Paschal
52efdb77b5
Merge pull request #6042 from Ultimaker/CS-227_hide_incorrect_tooltip
...
Hide incorrect tooltip
2019-07-23 11:50:06 +02:00
Jaime van Kessel
34e823e189
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-23 11:31:30 +02:00
Jaime van Kessel
0b37da93a0
Merge branch '4.2' of github.com:Ultimaker/Cura into 4.2
2019-07-23 11:30:59 +02:00
Jaime van Kessel
14a1882e14
Add missing 4.1-4.2 upgrade to bundled package list
2019-07-23 11:30:40 +02:00
ChrisTerBeke
7300f95a42
Hide incorrect tooltip
...
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
2019-07-22 21:21:18 +02:00
Ghostkeeper
ca48f9171f
Merge branch '4.2'
2019-07-22 17:32:21 +02:00
Ghostkeeper
02ff433c92
Use set for unordered collections of things
...
Contributes to issue CURA-6672.
2019-07-22 17:07:07 +02:00
Jaime van Kessel
203ea2a83f
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-22 16:52:16 +02:00
Jaime van Kessel
67a0dc2ed8
Also rename the PETG profiles
2019-07-22 16:45:26 +02:00
Jaime van Kessel
00f21069e7
Ensure that metadata entries in cura namespace are stored correctly
...
CURA-6672
2019-07-22 16:41:08 +02:00
Jaime van Kessel
222caef0b8
Rename imade3d profiles so it doesn't cause issues when upgrading
2019-07-22 16:15:15 +02:00
Jaime van Kessel
822181f214
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-22 16:15:01 +02:00
Ghostkeeper
eca8f3ab57
Correction to ironing tooltip
...
Fixes #6031 .
2019-07-22 11:47:56 +02:00
Ghostkeeper
5a51a036d7
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2019-07-22 11:42:08 +02:00
Ghostkeeper
edda75b682
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master
2019-07-22 11:35:24 +02:00
Jaime van Kessel
2af85899d7
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-22 11:23:27 +02:00
Jaime van Kessel
a5984da60c
Moved jellybox definitions to the right position
2019-07-22 11:21:24 +02:00
Jaime van Kessel
678621469f
Fix weird update jitter in objectSelector after multiplying models
2019-07-22 10:31:21 +02:00
Jaime van Kessel
c3166703b4
Also connect the objectsModel to the selectionChanged signal
2019-07-22 10:27:19 +02:00
Jaime van Kessel
91651a34d4
Fix model binding for objectSelector
2019-07-22 10:24:04 +02:00
Lipu Fei
4b8a216771
Fix typing
2019-07-22 09:34:00 +02:00
KOUBeMT
31bbb8b65f
Flow_&_Temp_tuning
2019-07-19 17:25:48 +02:00
