GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 05:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,819 Commits 295 Branches 268 Tags
Commit Graph

15819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages. 
Contributes to CURA-5670.
 2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled. 
Contributes to CURA-5670.
 2018-09-03 14:30:05 +02:00
Lipu Fei
ab572e9de2 SettingFunction evaluation needs a stack to provide values 
Note that this is still not correct. When the value gets evaluated, we
need to evaluate it with that container in the stack(s), but this case,
the stack may have other containers, so the evaluation can give
incorrect values because its context is simply not correct. This change
only prevents it from breaking because it's missing a provider.
 2018-09-03 14:03:46 +02:00
Aleksei S
f1d2d7ed36 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-03 11:16:42 +02:00
Jaime van Kessel
3969463758 Remove the old "not setup as group" notification 
CL-896
 2018-09-03 11:16:17 +02:00
Aleksei S
149a47e5a7 Remove double keys from right click menu, remove backspaceSelectionAction because not used 
CURA-5642
 2018-09-03 11:15:25 +02:00
Ghostkeeper
6df029971d
Don't crash if layer height is a formula 
We obtain the layer height here but that might be a formula so we should evaluate that formula here.

Fixes #4005.
 2018-09-03 11:02:24 +02:00
Ghostkeeper
1136033f97
Remove superfluous check for 'ok T:' 
This check is never hit because if there is 'ok T:' in the bytes array then it will have hit the first check for 'ok ' and 'T:'.
 2018-09-03 10:50:07 +02:00
Jaime van Kessel
b7d7091de8 Add padding around the printer icons 
CL-893
 2018-09-03 10:26:27 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue 
Switching between codestyles is hard :(
 2018-09-03 10:05:20 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel 
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
 2018-09-03 10:03:11 +02:00
Sacha Telgenhof Oude Koehorst
6ddafa00a4
Add Creality Ender-3 machine definition. 2018-09-01 19:37:53 +09:00
Mark
9bcc8ffff6
Merge pull request #4288 from thopiekar/patch-2 
bq Hephestos2: Getting a rid of custom g-code
 2018-09-01 09:25:17 +02:00
Ian Paschal
988b9059b9 Fix code-style 
Contributes to CURA-5670
 2018-08-31 16:55:03 +02:00
Jaime van Kessel
98d0ad6c27 Add printer pill type to cluster monitor printer tile 
CL-896
 2018-08-31 16:47:26 +02:00
Ian Paschal
dec76a19ed Build models using reserved tags 
Contributes to CURA-5670
 2018-08-31 16:13:01 +02:00
Jaime van Kessel
8aef7216ec Increase the margin between print montior header and tiles 
CL-896
 2018-08-31 16:11:20 +02:00
Jaime van Kessel
224108c342 Decrease width of popups for cluster monitor 
CL-896
 2018-08-31 15:55:22 +02:00
Jaime van Kessel
485058c3de Made queue have a max width 
CL-896
 2018-08-31 15:50:34 +02:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons" 
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
 2018-08-31 15:14:12 +02:00
Jaime van Kessel
3ce9b481a2 Add rabithole links to cluster monitor page 
CL-896
 2018-08-31 15:01:54 +02:00
Lipu Fei
8a507c34a3
Merge pull request #4312 from Ultimaker/CURA-5676_add_contacts_toolbox 
Cura 5676 add contacts toolbox
 2018-08-31 13:58:57 +02:00
Lipu Fei
98d8a3f3e3 Fix code style and small cleanup 
CURA-5676
 2018-08-31 13:49:10 +02:00
Lipu Fei
c4afbe7a67 Convert links to a dict 
CURA-5676

Easier to process.
 2018-08-31 13:45:04 +02:00
Lipu Fei
9433cf7c45 Change email field to show full email address 
CURA-5676
 2018-08-31 13:23:41 +02:00
Lipu Fei
e17cf3dfbf Show company website full link as text 
CURA-5676
 2018-08-31 13:20:42 +02:00
alekseisasin
9bd51d15ae
Merge pull request #4298 from Ultimaker/CURA-5675-reset_machines_for_removed_quality_changes 
CURA-5675 Reset machines that use a removed quality changes
 2018-08-31 12:00:31 +02:00
alekseisasin
aa2cb7d415
Merge pull request #4212 from fieldOfView/feature_support_infill_angle 
Add setting for Support Infill Line Direction
 2018-08-31 11:18:03 +02:00
Aleksei S
b0b148f2d0 Remove wrong setting 
CURA-5676
 2018-08-31 11:06:25 +02:00
Aleksei S
9258c9a7fc Added links to toolbox 
CURA-5676
 2018-08-31 11:03:30 +02:00
Diego Prado Gesto
a8cb1e25b4 Merge branch 'master' into fix_layer_number_width 2018-08-31 10:56:23 +02:00
Jaime van Kessel
e2bcf4dfa8 Show correct labels & status icon if print was aborted 
CL-896
 2018-08-30 17:18:48 +02:00
fieldOfView
65f3605d92 Allow the full range of orientations 2018-08-30 14:43:00 +02:00
fieldOfView
ac2125c3a5 Hide setting when support pattern is set to concentric... 
because it has no influence on the concentric pattern
 2018-08-30 14:36:54 +02:00
alekseisasin
0488494537
Merge pull request #4300 from Ultimaker/remove_double_extensions_cura_5650 
change .curaproject.3mf to just use .3mf
 2018-08-30 13:19:47 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +02:00
Jaime van Kessel
fd1b0a80e7 Fixed alignment of printCoreConfiguration 
CL-896
 2018-08-30 10:32:37 +02:00
Jaime van Kessel
14f253017b Align printer name & printjob name with center of printer icon 
CL-896
 2018-08-30 10:21:50 +02:00
Lipu Fei
9f158a995c
Merge pull request #4283 from Ultimaker/CURA-5555_ufp_material_profile 
Add materil xml file to UFP file
 2018-08-30 09:58:42 +02:00
Lipu Fei
570d0715ed Add call_on_qt_thread to UFPWriter.write() 
CURA-5555
 2018-08-29 17:38:36 +02:00
Lipu Fei
8f5aa82bdb Fix adding materials in UFP 
CURA-5555

Need to use getContainer() for a MaterialNode.
 2018-08-29 17:38:36 +02:00
Lipu Fei
939484bc91 Fix adding materials in UFP 
CURA-5555

 - Store materials in virtual path "/Materials"
 - Correct material relationship type
 - Add origin for material relationship
 - Use MaterialManager instead of ContainerRegistry to get materials
 - Other minor changes
 2018-08-29 17:25:36 +02:00
Mark
baef0350cd Cleaned up MIME types 2018-08-29 14:41:38 +02:00
Mark
43676d761c
Merge branch 'master' into master 2018-08-29 14:00:46 +02:00
Mark
17f51ca704
Merge branch 'master' into patch-2 2018-08-29 13:55:42 +02:00
Mark
c48a5474f0 remove .curaproject from the extensions and just use .3mf 
CURA-5650
 2018-08-29 13:42:26 +02:00
Lipu Fei
ee8d45f8a6
Merge branch 'master' into CURA-5675-reset_machines_for_removed_quality_changes 2018-08-29 12:53:46 +02:00
Lipu Fei
49743d8e6c
Merge pull request #4299 from Ultimaker/remove_maximum_length_printer_address 
Remove the 40 char maximum on printer address textfield
 2018-08-29 12:53:14 +02:00
Lipu Fei
c1e4b5f80d
Merge branch 'master' into remove_maximum_length_printer_address 2018-08-29 12:49:16 +02:00
Ghostkeeper
1d8f19f1d1
Don't give error value for infill layer thickness if no infill 
It won't crash the engine because the entire infill filling routine is skipped.
 2018-08-29 11:55:37 +02:00