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

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
75e351304c
Merge pull request #4652 from Ultimaker/CL-1119_monitor_tab_printer_names_clipped_too_short 
CL-1119 Use shorter machine name for skeleton and longer for text (Fix for 3.6)
 2018-10-25 16:52:50 +02:00
Ian Paschal
94d48101d9 Use different lengths for loading skeleton and printer name 
Contributes to CL-1119
 2018-10-25 16:45:49 +02:00
Diego Prado Gesto
f1d94d921c The MachineManager doesn't have the extruder stacks but the active 
machine does, so use it when setting the compatible material diameter to
the current extruder.

Contributes to CURA-5857.
 2018-10-25 16:27:16 +02:00
Diego Prado Gesto
197bf057cc Merge branch '3.6' into CURA-5857_fix_machine_settings_set_diameter 2018-10-25 15:57:26 +02:00
Jason Scurtu
2227c1debf recheck 2018-10-25 15:52:48 +02:00
Jason Scurtu
2c43294472 use "material_print_temperature" in material profile 2018-10-25 15:52:39 +02:00
Jason Scurtu
2b70613345 fix and improve 4max profile 2018-10-25 15:52:25 +02:00
Jason Scurtu
9532cc70b8 Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-25 15:52:12 +02:00
Jason Scurtu
73c6bdf028 Add Anycubic 4Max profile 2018-10-25 15:51:59 +02:00
Ghostkeeper
83f0213aa5
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2018-10-25 15:51:51 +02:00
Ghostkeeper
af325238f2
Merge branch 'addVariants' of https://github.com/ValentinPitre/Cura into ValentinPitre-addVariants 2018-10-25 15:48:07 +02:00
Diego Prado Gesto
4fda914dcf
Merge pull request #4472 from jscurtu/master 
Add Anycubic 4Max profile
 2018-10-25 15:26:31 +02:00
Lipu Fei
6fd7b49937 Fix setting extruder material diameter in Machine Settings dialog 
CURA-5857

It should update the value of the selected Extruder TAB, not the active
extruder on the printer.
 2018-10-25 15:11:04 +02:00
Lipu Fei
31bdeb8b73 Merge remote-tracking branch 'origin/3.6' into CURA-5821_fix_camera_memory_leak 2018-10-25 14:53:42 +02:00
THeijmans
9d5936492a TPU temperatures update 
Removal of all final and initial print temperature offsets, and huge increase in first layer print temperature. These changes should greatly improve first layer extrusion.
 2018-10-25 14:03:58 +02:00
Ghostkeeper
c7b146c9fc
Don't make retract distances negative 
People are reporting that the retraction is reversed. We can't test it since we have no firmware that supports the command at all. So we'll just not make the retract distance negative. That seems more logical anyway if you read the documentation of M600 to the letter.

Fixes #4249.
 2018-10-25 13:54:00 +02:00
Lipu Fei
0e1e8d269a Fix the extra setNextStack() 2018-10-25 13:40:34 +02:00
Jason Scurtu
1c5817b5b6 recheck 2018-10-25 13:01:05 +02:00
Jason Scurtu
39749dcaf6 use "material_print_temperature" in material profile 2018-10-25 12:45:01 +02:00
Lipu Fei
0d0384e331 Merge remote-tracking branch 'origin/3.6' 2018-10-25 11:43:06 +02:00
Lipu Fei
5e8dba5266 Remove some duplicate addExtruder() and setNextStack() calls 2018-10-25 11:42:47 +02:00
Diego Prado Gesto
dddda996dc
Merge pull request #4647 from Ultimaker/hotfix_show_printer_selection 
[3.6] CL-1117 Hotfix: Show printer selection
 2018-10-25 11:41:36 +02:00
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +02:00
Ian Paschal
1a67660196 Hotfix: Show printer selection 2018-10-25 10:54:59 +02:00
Ghostkeeper
47f820fe69
Don't disable entire view menu when viewing g-code 
Just disable the part about switching views.
Yes, you can still select the view from the actual view selection drop-down in the main window. Well, it's an improvement, not a complete fix. The complete fix is deferred.
 2018-10-25 10:47:21 +02:00
Jason Scurtu
65e3ee6854 fix and improve 4max profile 2018-10-24 19:46:21 +02:00
Sacha Telgenhof Oude Koehorst
103024f919
Reduced the number of polygons of the Ender-3 logo in the mesh bed in order to reduce file size of the STL. Also made the Ender logo punched through so it is a bit more noticeable on the build shader. 2018-10-24 23:22:22 +09:00
Ghostkeeper
12eb43b8fd
Merge branch 'CURA-5769_gcode_retraction' 2018-10-24 16:14:05 +02:00
Lipu Fei
9d07409cce WIP: Use CameraView for UM camera feeds 
CURA-5821

The original implementation that refreshes a QImage seems to cause
memory overflow on MacOSX and Windows. This is a different
implementation. It doesn't cause memory overflow, but it does consume a
lot of CPU power.
 2018-10-24 16:00:22 +02:00
Ghostkeeper
9b74dfd5ec
Correct typo 
intented -> intended
 2018-10-24 15:54:45 +02:00
Ghostkeeper
eea340d57a
Add typing 2018-10-24 15:54:14 +02:00
Lipu Fei
b00ea4719a WIP: Add custom CameraView for UM camera feed 
CURA-5821
 2018-10-24 15:44:19 +02:00
Ian Paschal
be5c1c8596
Merge pull request #4436 from Ultimaker/clean_print_job_info_block 
CL-897, CL-1051, CL-1111 Cura 3.6 Monitor Tab
 2018-10-24 12:29:46 +02:00
Diego Prado Gesto
e85b5febe1 Add pointing hand cursor shape when hovering the AccountWidget. 
Contributes to CURA-5784.
 2018-10-24 11:28:52 +02:00
Ian Paschal
d077dcc851 Fix printer card skeleton colors 
Contributes to CL-1051
 2018-10-24 11:13:38 +02:00
Ian Paschal
8662e1a125 Fix override dialog box 
Contributes to CL-897
 2018-10-24 11:13:12 +02:00
Diego Prado Gesto
bf1c23243e Modify the styles to match the requirements. 
Contributes to CURA-5784.
 2018-10-24 09:55:51 +02:00
Ian Paschal
a247fe204f Fix print job context menu height 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 16:27:45 +02:00
Ian Paschal
0045559d01 QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:45:44 +02:00
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