Lipu Fei
|
ebea5fbd14
|
Merge 4.4
|
2019-11-13 11:22:15 +01:00 |
|
Lipu Fei
|
c08e7df277
|
Fix typing
CURA-6976
|
2019-11-13 11:10:12 +01:00 |
|
Nino van Hooff
|
fe27193c98
|
Add dict key check for a crash found in IntentManager
CURA-6976
|
2019-11-13 11:01:03 +01:00 |
|
Nino van Hooff
|
eb4eddd49e
|
Add dict key check for a crash found in IntentManager
CURA-6976
|
2019-11-12 15:39:44 +01:00 |
|
Lipu Fei
|
d70a6e81b1
|
Merge 4.4
|
2019-11-12 14:39:30 +01:00 |
|
Lipu Fei
|
8228c6a743
|
Make sure position is not None
CURA-6974
|
2019-11-12 14:22:21 +01:00 |
|
Jaime van Kessel
|
17b8e9930c
|
Add handling for case where variant could not be found
CURA-6975
|
2019-11-12 13:28:12 +01:00 |
|
Nino van Hooff
|
558ed4b1e8
|
Change shadows on buildplate for one-at-a-time printing
Inner: adhesion area
Outer: full head
In my opinion this allows the user to more easily see whether this
object can be printed after another object.
|
2019-11-12 12:56:07 +01:00 |
|
Jaime van Kessel
|
3da53a3a89
|
Merge branch 'CURA-6856_signed_plugins_and_packages' of github.com:Ultimaker/Cura
|
2019-11-12 10:48:43 +01:00 |
|
Jaime van Kessel
|
4613b62120
|
Merge branch '4.4' of github.com:Ultimaker/Cura
|
2019-11-11 16:01:19 +01:00 |
|
Jaime van Kessel
|
e2414ed5c9
|
Also log the exception when the connection failed to connect
|
2019-11-11 15:58:39 +01:00 |
|
Lipu Fei
|
896b73f8b3
|
Fix typing
|
2019-11-11 08:57:34 +01:00 |
|
Lipu Fei
|
d13683f4db
|
Merge remote-tracking branch 'origin/4.4'
|
2019-11-11 08:13:53 +01:00 |
|
Jaime van Kessel
|
4f569194ec
|
Add extra typing
|
2019-11-08 17:36:50 +01:00 |
|
Jaime van Kessel
|
463822f10f
|
Fix some typing issues
|
2019-11-08 16:50:23 +01:00 |
|
Jaime van Kessel
|
b8f76d7bfb
|
Use QtApplication instead of Application
In live code it doesn't cause problems, but the static checker found it
|
2019-11-08 14:13:19 +01:00 |
|
Jaime van Kessel
|
e2a387b246
|
Add own getInstance for curaApplicaiton
This makes the typing a bit smarter
|
2019-11-08 13:59:38 +01:00 |
|
Jaime van Kessel
|
9940bc8551
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2019-11-08 13:38:58 +01:00 |
|
Jaime van Kessel
|
00078fd659
|
Remove a bunch of unused imports
|
2019-11-08 13:38:42 +01: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
|
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
|
36b924154b
|
Merge remote-tracking branch 'origin/master' into CURA-6856_signed_plugins_and_packages
|
2019-11-06 15:54:19 +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 |
|
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
|
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
|
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 |
|
Jaime van Kessel
|
2e3c3c7bd0
|
Change the engineering intent tooltip (again)
Let's hope that this is the final one...
CURA-6890
|
2019-11-04 16:07:15 +01:00 |
|
Nino van Hooff
|
8389c2c17a
|
Add the (probably) final intent profile descriptions (English)
CURA-6890
|
2019-11-04 11:51:10 +01:00 |
|
Remco Burema
|
4bae97529c
|
Should check plugins if build-type is 'essentials' now.
part of CURA-6856
|
2019-11-01 17:03:20 +01:00 |
|
Remco Burema
|
3dabd6023b
|
Merge branch 'master' into CURA-6856_signed_plugins_and_packages
|
2019-11-01 16:45:42 +01:00 |
|
Jaime van Kessel
|
c2e6116983
|
Add names to all the threads
|
2019-11-01 16:20:42 +01:00 |
|
Jaime van Kessel
|
b3bf77524b
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2019-11-01 15:15:31 +01:00 |
|
Jaime van Kessel
|
be0e1f7284
|
Ensure that all updates from settingInheritance are on a timer
|
2019-11-01 15:14:33 +01:00 |
|
Nino van Hooff
|
b6fc8523f3
|
refactor ConvexHullDecorator.getConvexHull
CURA-6522
|
2019-10-31 16:40:32 +01:00 |
|
Nino van Hooff
|
6971e1f9cf
|
Add clarifying documentation to getConvexHull
CURA-6522
|
2019-10-31 15:01:24 +01:00 |
|
Nino van Hooff
|
e5fb9fb8cf
|
Remove hack used to draw some build area edge border
This disallowed area should not exist and caused difference in behavior
between all-at-once and one-at-a-time printing for a single object
CURA-6522
|
2019-10-31 14:59:54 +01:00 |
|
Jaime van Kessel
|
1af1a8ddcb
|
Rename "smooth" intent to draft
CURA-6890
|
2019-10-31 13:26:49 +01:00 |
|