GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,030 Commits 295 Branches 268 Tags
Commit Graph

17030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
f9545a339d QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:41:56 +02:00
Ian Paschal
1bd488dd6c Remove comments 
Contributes to CL-897
 2018-10-23 15:25:42 +02:00
Remco Burema
3dab627670
Merge pull request #4618 from Ultimaker/CURA-5834_fix_material_model_update 
CURA-5834 Fix material model update
 2018-10-23 14:54:34 +02:00
Diego Prado Gesto
45d4c1a0db
Merge pull request #4600 from Ultimaker/STAR-273_update_oauth2_requested_scopes 
Update OAuth2 scopes
 2018-10-23 14:01:03 +02:00
Remco Burema
fb9d85557e Missed one of the getCompatibleMaterialDiameter typo's in the previous commit. 
part of [CURA-5834]
 2018-10-23 13:57:42 +02:00
Diego Prado Gesto
e4edcac964
Merge pull request #4641 from Ultimaker/M&P-Setting-Optimization 
Support - Brim interactions
 2018-10-23 13:53:44 +02:00
Diego Prado Gesto
87bcb368fb Merge branch 'master' into M&P-Setting-Optimization 2018-10-23 12:27:52 +02:00
Diego Prado Gesto
41edfe85b5
Merge pull request #4613 from Ultimaker/CURA-5812_fix_machine_actions 
CURA-5808 Fix machine actions
 2018-10-23 12:11:26 +02:00
Diego Prado Gesto
e061fc4263 Add comments to the unit test to better know how it works. 
Contributes to CURA-5808.
 2018-10-23 10:59:36 +02:00
Lipu Fei
e48c24e1dc Fix material diameter for deltacomb 
CURA-5753
 2018-10-23 10:35:50 +02:00
Lipu Fei
158c1e4736
Merge pull request #4149 from kaleidoscopeit/master 
- Fixed extruder behaviour to force filament diameter to 1.75
 2018-10-23 10:35:07 +02:00
Lipu Fei
1675ad4ba5
Merge pull request #4487 from fieldOfView/fix_marlin_press_to_resume 
Fix "press to resume" message after heating bed when usb is connected
 2018-10-23 10:27:40 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Lipu Fei
89cb67017f Add unit test for addDefaultMachineActions() 
CURA-5812
 2018-10-23 08:49:23 +02:00
Lipu Fei
cbd8c8739d Merge from master 2018-10-23 08:08:37 +02:00
Ian Paschal
9a16d45be5 Round divisions 
Contributes to CL-1051, CL-897, CL-1111
 2018-10-22 16:02:55 +02:00
Ian Paschal
34abc48a1a Remove binding loops 
Contributes to CL-1051
 2018-10-22 15:31:38 +02:00
Tim Kuipers
56fdab276e brim_replaces_support is now based on the support infill extruder 2018-10-22 13:49:51 +02:00
Lipu Fei
e4014f8c69 Remove trailing spaces 
CURA-5841
 2018-10-22 12:52:17 +02:00
Lipu Fei
f9122a8c1b
Merge pull request #4501 from stelgenhof/master 
Ender-3 machine definition update
 2018-10-22 12:51:10 +02:00
Lipu Fei
eef7be3ed6 Use empty string for empty build plate 
CURA-5844

Or there can be a configuration mismatch.
 2018-10-22 11:54:13 +02:00
Diego Prado Gesto
dbb62f2490 Add default icons for the avatar. 
Contributes to CURA-5784.
 2018-10-22 11:31:19 +02:00
Lipu Fei
ea9aa2c777 Add doc for using setCompatibleMaterialDiameter() in QML 
CURA-5834
 2018-10-22 10:56:11 +02:00
Diego Prado Gesto
69fc1e5bfb Reuse ActionButton component to create the toolbox shortcut. 
Contributes to CURA-5784.
 2018-10-22 10:30:06 +02:00
Diego Prado Gesto
fe216a7387 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-22 09:53:29 +02:00
Ghostkeeper
15a538bb94
Remove arbitrary limits on wall speed overhang factor 
There is no physical or programmatical limitation to the wall speed overhang factor. In particular, you could want the overhang speed to be higher than the normal printing speed.
 2018-10-21 02:07:46 +02:00
Diego Prado Gesto
17732b1169 Make the spacing between the orientation controls be dependent on the 
theme.

Contributes to CURA-5772.
 2018-10-19 17:04:40 +02:00
Diego Prado Gesto
17b77c58ef Make the spacing between the orientation controls be dependent on the 
theme.
 2018-10-19 17:03:48 +02:00
Diego Prado Gesto
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing 
more on the top than the header.

Contributes to CURA-5784.
 2018-10-19 16:40:21 +02:00
Ian Paschal
817899686a Dark mode theme improvements 
Contributes to CL-1111
 2018-10-19 16:23:16 +02:00
fieldOfView
68c3023a46 Make sure firmware name is only requested once 2018-10-19 14:38:25 +02:00
fieldOfView
71d365c0c6 Fix case where Cura and the firmware could be waiting for eachother 2018-10-19 14:37:20 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Diego Prado Gesto
6f12197cea Don't use an image to create a mask but a circle. 
Contributes to CURA-5772.
 2018-10-19 13:41:32 +02:00
Aleksei S
22db3cb32b Show retraction for G92 command 
CURA-5769
 2018-10-19 13:18:42 +02:00
Lipu Fei
ea10d5e608 Rename to comptabileMaterialDiameter 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
 2018-10-19 11:36:12 +02:00
Lipu Fei
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 
CURA-5814 material cost now always shown
 2018-10-19 11:20:29 +02:00
Lipu Fei
537108032e Fix typing in PrinterOutputModel 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
0e772beb14 Fix typing in MachineActionManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
59704e4c0e Make sure that a machine's default actions are added before it gets activated 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c67abb61a8 Remove unused argument "index" in addFirstStartAction() 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
6dc01d4c08 Add typing for MachineActionsManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c1b9d527bb Add typing for MachineAction 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Lipu Fei
e5efd1e41f Move constant definition into constructor 
CURA-5812
 2018-10-19 09:57:57 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion 
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
 2018-10-19 09:55:23 +02:00
THeijmans
2512800340 Support - Brim interactions 
Enable Support - brims and disable 'brim replaces support' for all support materials.
 2018-10-19 09:25:13 +02:00
Ghostkeeper
9aa7b76dbe
Update change log with 3.5.1 changes 
Too little, too late. But at least you'll be able to look back on it.
 2018-10-19 07:55:39 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind) 
Contributes to CURA-5772.
 2018-10-18 17:52:42 +02:00