3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
29052 commits 342 branches 300 tags 748 MiB
Commit graph

7047 commits

Author SHA1 Message Date
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
Jaime van Kessel
f679b557dc
Add visual quality to model to be translatable 
CURA-6942
 2019-10-31 11:54:06 +01:00
Tim Kuipers
96f8dab853 dont prepend 'Pre-sliced file' 2019-10-31 11:43:26 +01:00
Jaime van Kessel
1284d9fe8d
Fix setting prefered material on machine creation 
The previous check would occasionaly set duplicated materials
 2019-10-30 11:27:46 +01:00
Remco Burema
298eb27c7f
Add possibility to check material-profiles. 
Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow.
part of CURA-6856
 2019-10-29 17:45:19 +01:00
Ghostkeeper
2beeca0687
Merge branch 'qml_speed_improvements' 2019-10-28 16:43:14 +01:00
Jaime van Kessel
26ba0e645a
Ensure that first start machine actions model gets initialized 
CURA-6932
 2019-10-28 16:33:08 +01:00
Jaime van Kessel
9906d454ce
Merge branch 'qml_speed_improvements' of github.com:Ultimaker/Cura into qml_speed_improvements 2019-10-28 16:08:04 +01:00
Jaime van Kessel
7204deac0c
Rename function to beter reflect what it does 
CURA-6932
 2019-10-28 16:07:35 +01:00
Ghostkeeper
95350cda51
Revert "Add a few process events to setActiveMachine to make it react more smooth" 
This reverts commit 27701f7653. After discussion with Nallath we've decided that it wasn't that noticeable and could temporarily display wrong names in the interface. We've decided to undo it for now.

Contributes to issue CURA-6932.
 2019-10-28 16:04:43 +01:00
Lipu Fei
b360e0db39 Fix numberExtrudersEnabled returning None 
CURA-6931
 2019-10-28 10:44:24 +01:00
Jaime van Kessel
27701f7653
Add a few process events to setActiveMachine to make it react more smooth 2019-10-25 15:28:17 +02:00
Jaime van Kessel
93e97c5dce
Add update timer to intentCategory model 2019-10-25 15:15:21 +02:00
Jaime van Kessel
f090b5898e
Small qml speed improvements for setting item 2019-10-25 15:09:31 +02:00
Jaime van Kessel
98275d2da0
Create first start model on demand 
So if we don't use it, we don't spend any time on it.
 2019-10-25 13:44:55 +02:00
Jaime van Kessel
552b456a69
Merge branch 'network-printer-selection-is-back' of github.com:Ultimaker/Cura 2019-10-25 12:49:18 +02:00
ChrisTerBeke
9a3ff527ac Bring back the printer selection dialog for networked printers 2019-10-25 12:25:41 +02:00
Jaime van Kessel
3491900bf1
Fix grammar in a comment 2019-10-25 11:06:01 +02:00
Remco Burema
7780d76eb6
Intiial work on 'Singing of Plugins and Material Packages'. 
Most of the work is in Uranium right now -- especially since the plugins part is picked up first, and there are already plugins at Uraniums level.

part of CURA-6856
 2019-10-24 17:31:53 +02:00
Jaime van Kessel
d905b8b8cc
Add extra reporting stage for splash screen 
CURA-6823
 2019-10-24 15:55:49 +02:00
Ghostkeeper
969b74e1f6
Prevent crash when sync list somehow contains None 
I couldn't figure out how it could ever contain None, but we received logs from a user that indicate a crash here because that set contains None and that is not orderable. This is a hotfix to fail more gracefully instead of crashing the entire application.
 2019-10-24 11:56:08 +02:00