Jaime van Kessel
76163636a1
Fix the simple create machine test
2019-05-24 16:36:39 +02:00
Jaime van Kessel
66d8e41064
Also add tests for the update of the objects mode
...
CURA-6283
2019-05-24 15:27:08 +02:00
Jaime van Kessel
834e6344df
Cut up large update function to make testing easier
...
CURA-6283
2019-05-24 13:26:11 +02:00
Jaime van Kessel
0bede7e3c5
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-24 12:53:56 +02:00
Lipu Fei
8a18e0c65c
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-24 10:51:19 +02:00
Lipu Fei
7c6c00df84
Merge remote-tracking branch 'origin/4.1'
2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b
Calculate bounding box for helper meshes
2019-05-24 10:49:35 +02:00
Jaime van Kessel
bd39a9c591
Simplify & cleanup objects mode
...
CURA-6283
2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26
Simplify the objects model further
...
CUA-6283
2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175
Remove unneeded check
...
CURA-6283
2019-05-23 16:04:39 +02:00
Jaime van Kessel
4a6495a0e6
Remove unneeded itemsChanged emit
...
CURA-6283
2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c
Renamed some local variables so they describe better what they do
...
CURA-6283
2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6
Fixed typing
...
CURA-6283
2019-05-23 15:59:14 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting"
...
This reverts commit bec7b6546d7094b222b1https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.
Conflicts:
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
2019-05-23 13:40:11 +02:00
Lipu Fei
288770b991
Fix merge conflicts
2019-05-23 11:37:51 +02:00
Lipu Fei
fb33497ff1
Fix auto-slice for per-object settings
...
CURA-6539
2019-05-23 11:36:55 +02:00
Lipu Fei
3ca272ff72
Merge remote-tracking branch 'origin/4.1'
2019-05-22 07:44:26 +02:00
Lipu Fei
5d58d60a16
Fix typing
...
CURA-6283
2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b
Change import
...
CURA-6182
2019-05-21 15:17:04 +02:00
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
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
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
