3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 11:51:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
24127 commits 343 branches 300 tags 738 MiB
Commit graph

6332 commits

Author SHA1 Message Date
Lipu Fei
c9642273eb Fix typing 
CURA-6283
 2019-05-21 15:15:18 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming 
CURA-6283

For both individual nodes and grouped nodes.
 2019-05-21 14:49:45 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function 
CURA-5395
 2019-05-20 16:34:24 +02:00
Jaime van Kessel
f7d0bcd0d4 Prevent modifier meshes from blocking one at a time slicing 
CURA-6030
 2019-05-20 14:40:41 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name 
CURA-6497 Add validation for empty strings in SettingDefinition
 2019-05-20 13:40:39 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +02:00
Ghostkeeper
2ada8cec72
Cast autosave delay preference to int 
Oops. How long has this been in there, you think? At least 3 years.
As seen in #5729, when changing this preference it results in an error that it can't set the interval to a string. The default is an integer, so if you don't edit it it works fine, but if you edited the preferences file, it gets a string from the preferences file. Casting both to an int should work.
 2019-05-20 13:33:33 +02:00
Jaime van Kessel
c1818bcfbe Add test for CuraStackBuilder 2019-05-20 08:57:58 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Remco Burema
4813ff0bb7 Ask users to write English in crash-report. 2019-05-17 10:37:25 +02:00
Jaime van Kessel
8b73f7cef9 No longer create convex hulls for modifier meshes 
CURA-6030
 2019-05-17 09:47:47 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
1c9eab6b2b Prevent crashes when backup fails to be restored 
Also add a bit of logging so that we know what / how it went wrong
 2019-05-16 15:48:09 +02:00
Jaime van Kessel
915e0e2047 Only add extrudernr to used extruders if it actually exists 
This can cause issues when a profile got messed up (especially when using profiles between different custom machines)
 2019-05-16 15:41:52 +02:00
Jaime van Kessel
186eef0b68 Fix backup causing a crash in specific situations 2019-05-16 15:38:44 +02:00
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Ghostkeeper
1f6a8f2f75
Increment default API version number 2019-05-16 14:27:53 +02:00
Diego Prado Gesto
2cbdc49539 Merge branch '4.1' 2019-05-16 12:13:04 +02:00
Diego Prado Gesto
c4044e731a Fix typo in a log warning message 2019-05-16 12:04:26 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info 
CURA-6525
 2019-05-15 17:25:31 +02:00
Ian Paschal
51d298cca5 Update Machines.py 
Contributes to CL-1331
 2019-05-15 10:58:56 +02:00
Ian Paschal
20e4142667 Final typing fix 
Contributes to CL-1331
 2019-05-15 10:51:18 +02:00
Ian Paschal
59eb9bbab1 Make connection types list ints 
Contributes to CL-1331
 2019-05-15 10:47:25 +02:00
Ian Paschal
02cb41e007 Improve typings 
Contributes to CL-1331
 2019-05-15 10:31:00 +02:00
Ian Paschal
c7f6351903 Add typings 
Contributes to CL-1331
 2019-05-15 10:09:27 +02:00
Ian Paschal
e39769cc00 Fix last typing issue 
Contributes to CL-1331
 2019-05-13 14:59:23 +02:00
Ian Paschal
b8ab9f6398 Fix typings 
Contributes to CL-1331
 2019-05-13 14:53:58 +02:00
Ian Paschal
177e031f4f Add "lite" Machine class 
Contributes to CL-1331
 2019-05-13 14:45:02 +02:00
Ian Paschal
df6898ae45 Add connection_types to fake machine 
Contributes to CL-1331
 2019-05-09 16:41:15 +02:00
Ian Paschal
d391ec4e6b Comments 
Contributes to CL-1331
 2019-05-09 16:41:01 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML 
Contributes to CL-1331
 2019-05-09 16:19:59 +02:00
Ian Paschal
03fd9da417 Always return a fake machine, even if empty 
Contributes to CL-1331
 2019-05-09 16:19:39 +02:00
Ian Paschal
26ab359a93 Add more endpoints to machines API 
- getCurrentMachine
- setCurrentMachineGroupName
- updateCurrentMachineConfiguration

Also shortened `global_container_stack` to `global_stack` since every stack is a container stack.

Contributes to CL-1331
 2019-05-09 16:01:44 +02:00
Ian Paschal
dc21269834 Add first machines endpoint 
Contributes to CL-1331
 2019-05-09 14:52:08 +02:00
Lipu Fei
2054413952 Add handling for ValidatorState.Invalid 
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
 2019-05-09 12:07:16 +02:00
Lipu Fei
0023f5a45d Merge remote-tracking branch 'origin/4.1' 2019-05-07 14:32:03 +02:00
Lipu Fei
5e43e723e7 Fix activeMaterialsCompatible() 
CURA-6511

Looks like a merge conflict
 2019-05-07 14:28:13 +02:00
Diego Prado Gesto
5fffa200f7 Make the "Not supported" profile label translatable 
Contributes to CURA-6502.
 2019-05-07 12:04:19 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Diego Prado Gesto
1093a2d65f Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-06 14:34:40 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations 
Contributes to CURA-6509.
 2019-05-06 14:33:24 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog 
CURA-6495
 2019-05-06 13:06:23 +02:00
Ghostkeeper
fca21834dd
Merge branch '4.1' 2019-05-06 11:47:41 +02:00
Jaime van Kessel
eb690a459f Fix boundingbox calculation of grouped groups 
Previously this would cause a crash because the bounding box of the outermost
group would not take the bounding boxes of it's children's children into acocunt.

CURA-6501
 2019-05-06 11:40:47 +02:00