GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 00:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,187 Commits 291 Branches 260 Tags
Commit Graph

11187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
2f441ba7e1 Remove debugging log lines 
CURA-4451
 2017-10-26 11:36:59 +02:00
Lipu Fei
9488d543de Merge pull request #2677 from fieldOfView/fix_isclusterprinter 
Fix qml error when there is no connected printer
 2017-10-26 11:23:39 +02:00
Lipu Fei
701e9a91c2 Allow using longer accent for machines in job names 2017-10-26 11:13:30 +02:00
fieldOfView
fff9330949 Merge branch 'master' into fix_is_clustersize 
# Conflicts:
#	plugins/UM3NetworkPrinting/UM3InfoComponents.qml
#	resources/qml/Menus/MaterialMenu.qml
#	resources/qml/Menus/NozzleMenu.qml
 2017-10-26 11:09:13 +02:00
ChrisTerBeke
f0ed3bc588 Always populate extruder stacks when creating global stack - CURA-4482 2017-10-26 11:05:35 +02:00
ChrisTerBeke
c54dc0a723 Merge branch 'master' into container_stack_improvements 2017-10-26 10:19:45 +02:00
ChrisTerBeke
8826f86b54 Remove debug logging - CURA-4451 2017-10-26 09:58:01 +02:00
ChrisTerBeke
a5ec64bf7c Remove builder premium extruder definitions - CURA-4451 2017-10-26 09:55:01 +02:00
ChrisTerBeke
ac40de7272 Remove builder premium resources that were used for testing (separate PR to add them back) - CURA-4451 2017-10-26 09:54:06 +02:00
ChrisTerBeke
b1a4c3488f Merge branch 'master' into CURA-4451_not_support_container 2017-10-26 09:48:52 +02:00
ChrisTerBeke
fc48ba7bae Remove all not supported quality profiles - CURA-4451 2017-10-26 09:48:31 +02:00
ChrisTerBeke
0377edaa0f resolve conflicts 2017-10-26 09:26:18 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
Lipu Fei
e4fec1f63d Move SaveButton downwards 
CURA-4490

Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
 2017-10-25 16:35:38 +02:00
ChrisTerBeke
88ffe0d358 correctly show not supported when any of the extruders has a not supported profile - CURA-4451 2017-10-25 15:57:53 +02:00
Diego Prado Gesto
56171776f6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-25 13:57:04 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00
ChrisTerBeke
9b62b48509 WIP - CURA-4451 2017-10-25 13:27:35 +02:00
Ghostkeeper
73e809b956
Remove specialised start g-code from Creality CR-10 
By request from Michael.
This makes it the same as the start g-code for the Custom FDM Printer, which apparently works better.
 2017-10-25 13:20:05 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer 
Also fixes code style
 2017-10-25 11:52:43 +02:00
Ghostkeeper
9ad0fd2b83
Remove dash if plug-in author is empty 
Contributes to issue CURA-4477.
 2017-10-25 11:28:41 +02:00
Aleksei S
d2873dc65a The view class were not added after to the rendering list after changing them 
CURA-4062
 2017-10-25 11:06:12 +02:00
daid
e824996af7 Fix the OpenGL shader for older (legacy?) OpenGL. As the grid shader was no longer working. 2017-10-25 10:19:28 +02:00
ChrisTerBeke
7bf854aa0f Remove some changes, debugging - CURA-4451 2017-10-25 09:52:14 +02:00
Aleksei S
0f807cd03e Wfter changing the view the old view is removed from rendering 
CURA-4062
 2017-10-24 17:38:06 +02:00
Diego Prado Gesto
7404df66ac CURA-4481 Disable "Remove empty layers" when support is enabled. 
When support is enabled then it doesn't matter if the user choose
whether to remove or not the empty layers, because it's done after
generating supports. In order to avoid confusion to the user, the
setting is disabled.
 2017-10-24 16:46:45 +02:00
Diego Prado Gesto
ba3f1362e6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-24 15:59:17 +02:00
Diego Prado Gesto
0eedfa5c18 CURA-4485 Disabling automatic material and variant when connecting to a 
printer within a cluster of more than 1 printer.
 2017-10-24 15:45:20 +02:00
Jack Ha
a66d27e30e CURA-4176 reintroduced Wall Extruder. Added limit_to_extruder trick in wall_line_width as suggested in issue to evade inheritance problems. 2017-10-24 15:01:57 +02:00
Diego Prado Gesto
6dfd04928f CURA-4485 Activate configuration option disabled in printers within a 
cluster.
Just allow when there is a cluster with just one printer.
 2017-10-24 14:51:35 +02:00
ChrisTerBeke
c679f4aa6b Merge branch 'master' into CURA-4451_not_support_container 2017-10-24 13:41:14 +02:00
ChrisTerBeke
c1139c5c45 Update stack error checking when switching matchines - CURA-4447 2017-10-24 13:38:14 +02:00
fieldOfView
15abbe6d6b Optimise icon 2017-10-24 12:50:53 +02:00
ChrisTerBeke
9083fe1bf0 Add not supported instance container type and qt role - CURA-4451 2017-10-24 11:53:56 +02:00
fieldOfView
7dc4975b36 Tweak layout and texts 2017-10-24 11:33:47 +02:00
Jack Ha
5d51d547da Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-24 11:25:21 +02:00
Jack Ha
d8e1b5b9b4 CURA-4481 add setting Remove Empty First Layers 2017-10-24 11:25:12 +02:00
fieldOfView
46fc478f9d Tweak disabled appearance 2017-10-24 11:15:33 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
alekseisasin
b0c54bb26a Merge pull request #905 from Ultimaker/snappier_camera_animation 
Make camera animation feel snappier
 2017-10-24 10:36:55 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
fieldOfView
6294900bc7 Disable controls when manual control is not available 2017-10-24 10:23:07 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
fieldOfView
9cd8869382 Add settable jog distance 2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3 Add controls for jogging the head/bed 2017-10-23 21:27:53 +02:00
ChrisTerBeke
3794ae16ae Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451 2017-10-23 17:41:58 +02:00
ChrisTerBeke
d018e0b2bb First steps towards salvation - CURA-4451 2017-10-23 17:34:31 +02:00
alekseisasin
f6cd7327d3 Merge pull request #2660 from Ultimaker/CURA-4447_UPDATE_INSTANCE_CONTAINER 
Cura 4447 update instance container
 2017-10-23 16:27:21 +02:00
ChrisTerBeke
3ef680af5e Merge branch 'master' into CURA-4451_not_support_container 2017-10-23 15:57:11 +02:00
ChrisTerBeke
d2ef373d19 Also apply container changes when no user interaction is required - CURA-4447 2017-10-23 15:50:42 +02:00