Jaime van Kessel
00078fd659
Remove a bunch of unused imports
2019-11-08 13:38:42 +01:00
Kaz
a5aa4c75ba
update gantry_height
2019-11-08 14:11:34 +08:00
Remco Burema
00f505374b
Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44
...
Cura 6917 unlink duplicated material
2019-11-07 17:23:28 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques.
...
part of CURA-6917
2019-11-07 17:19:18 +01:00
Nino van Hooff
6e79f489e2
When multiple linked materials are found, only display the first
...
CURA-6917
2019-11-07 15:51:22 +01:00
Nino van Hooff
0b450ef9f4
Fix linked materials not being found due to key casing
...
CURA-6917
2019-11-07 15:51:22 +01:00
Remco Burema
19d334f35c
Fix typing imports.
2019-11-07 14:31:38 +01:00
Lipu Fei
832b4f28dc
Fix merge conflicts with 4.4
2019-11-07 13:56:20 +01:00
ninovanhooff
d503f9df25
Merge pull request #6635 from Ultimaker/CURA-6854_align_layer_label_top_bottom
...
Fix window resize bug in LayerSlider concerning handle position
2019-11-07 13:04:01 +01:00
Nino van Hooff
ba6cf8eae5
Fix window resize bug in LayerSlider concerning handle position
...
Upper handle position would not be updated on resize
CURA-6854
2019-11-07 12:46:45 +01:00
Remco Burema
16b90d00b7
Merge pull request #6615 from Ultimaker/CS-476_improve_packages_api_speed
...
Packages API speed improvements
2019-11-07 11:31:24 +01:00
ChrisTerBeke
7dc38cd55d
Merge branch '4.4' into CS-476_improve_packages_api_speed
2019-11-07 10:31:37 +01:00
Lipu Fei
5e255b548e
Fix TestLegacyProfileReader
2019-11-07 10:21:01 +01:00
Lipu Fei
c8486b8f01
Merge remote-tracking branch 'origin/master' into CURA-6856_signed_plugins_and_packages
2019-11-07 09:55:54 +01:00
Lipu Fei
34c080c4bd
Add _trustHook() to MockContainer
...
CURA-6856
2019-11-07 09:55:44 +01:00
Lipu Fei
3f93dde6b0
Merge remote-tracking branch 'origin/4.4'
2019-11-07 09:50:02 +01:00
Remco Burema
da92c36afb
Don't show tooltip immediately.
2019-11-06 17:22:58 +01:00
Lipu Fei
36b924154b
Merge remote-tracking branch 'origin/master' into CURA-6856_signed_plugins_and_packages
2019-11-06 15:54:19 +01:00
Lipu Fei
d346dd4090
Fix TestDefinitionContainer
2019-11-06 15:43:43 +01:00
Lipu Fei
33f876d749
Fix leapfrog bolt pro definition files
2019-11-06 15:43:22 +01:00
Lipu Fei
179d2c924d
Fix typing
2019-11-06 12:59:51 +01:00
Lipu Fei
7c36b6a8ba
Resolve merge conflicts with master
2019-11-06 12:01:49 +01:00
Jaime van Kessel
c22281ad9c
Merge branch '4.4' of github.com:Ultimaker/Cura
2019-11-05 15:00:14 +01:00
Jaime van Kessel
04304c1515
Correctly sort the intents in QualityManagementModel
...
CURA-6956
2019-11-05 14:59:44 +01:00
Jaime van Kessel
ff8d8735de
Make the intents in QualityManagementModel also translated
...
CURA-6956
2019-11-05 14:57:44 +01:00
Jaime van Kessel
674d8d387b
Move translations for intent to it's own file
...
CURA-6956
2019-11-05 14:52:12 +01:00
Remco Burema
0d72563dd3
Update i18n headers.
...
part of CURA-6957
2019-11-05 13:34:44 +01:00
Ghostkeeper
3ed53a99f6
Update missing translations from new translation template
...
Contributes to issue CURA-6957.
2019-11-05 13:32:11 +01:00
Jaime van Kessel
cb7552a926
Merge branch 'CURA-6854_align_layer_label_top_bottom' of github.com:Ultimaker/Cura
2019-11-05 13:23:34 +01:00
Remco Burema
b4974dc794
Update translation files with the template.
...
part of CURA-6957
2019-11-05 13:22:58 +01:00
Ghostkeeper
d87d38ceed
Update translation template files for 4.4
...
Contributes to issue CURA-6957.
2019-11-05 13:18:34 +01:00
Jaime van Kessel
870db0641b
Ensure that machines with 1.75mm filament select the right preferred material
...
CURA-6950
2019-11-05 13:11:49 +01:00
Lipu Fei
0ad5ce19da
Fix leapfrog profiles
...
CURA-6951
2019-11-05 12:49:27 +01:00
Lipu Fei
2e4e19594f
Merge pull request #6608 from Leapfrog3DPrinters/master
...
Leapfrog Bolt Pro machine profile
2019-11-05 12:48:39 +01:00
Lipu Fei
af909b25a2
Merge pull request #6624 from Ultimaker/CURA-6569_mandatory_marketplace_login
...
WIP: CURA-6569_mandatory_marketplace_login
2019-11-05 11:04:14 +01:00
Lipu Fei
8baa009f1f
Use IsEnterpriseVersion in Toolbox
...
CURA-6569
2019-11-05 10:53:52 +01:00
Lipu Fei
b843210fd3
Add machine name to the machine settings dialog
2019-11-05 10:48:18 +01:00
Lipu Fei
792c365e9e
Remove hardcoded essentials
...
CURA-6569
2019-11-05 10:40:33 +01:00
Lipu Fei
2f41cf4218
Merge pull request #6623 from Ultimaker/CURA-6569_toolbox_qml_refactor
...
Organize Toolbox (marketplace) qml files according to type
2019-11-05 10:38:42 +01:00
Lipu Fei
689562e61b
Add IsEnterpriseVersion flag
...
CURA-6569
2019-11-05 09:59:35 +01:00
Lipu Fei
eeed98746d
Merge remote-tracking branch 'origin/4.4'
2019-11-05 09:49:14 +01:00
Jaime van Kessel
366dd4bd00
Swap the splashscreen image
...
RIP Ultibot :(
CURA-6656
2019-11-05 09:33:50 +01:00
Nino van Hooff
ed7134ded8
Organize Toolbox (marketplace) qml files according to type
...
CURA-6569
2019-11-04 17:35:24 +01:00
Jaime van Kessel
9d9d82dc24
Make logging when using a fallback for preferred material more explicit
...
CURA-6950
2019-11-04 16:58:57 +01:00
Ghostkeeper
f48a5ec028
Fix zigzag initial layer pattern for Skriware 2
2019-11-04 16:43:54 +01:00
Ghostkeeper
b34c0e8eb7
Don't check A: and B: drives for USB sticks
...
Fixes #2438 .
2019-11-04 16:35:49 +01:00
Vincent Riemens
c30ec406cf
Add files via upload
2019-11-04 16:28:55 +01:00
Vincent Riemens
0b76f221b4
Delete leapfrog_bolt_pro.def.json
2019-11-04 16:28:35 +01:00
Ghostkeeper
74d52bbd1c
Fix complaints from CI system about settings that don't work
...
There's one that needed to be a 'value' to properly overwrite it. The rest are all about settings that were equal to the defaults anyway so I've removed those.
Contributes to issue CURA-6949.
2019-11-04 16:18:46 +01:00
Jaime van Kessel
f1b9ac1c21
Fix aspect ratio of logo in about window
...
CURA-6934
2019-11-04 16:15:40 +01:00
