pinchies
1f97aa3df6
Add files via upload
2018-10-26 23:37:31 +11: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
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
Ghostkeeper
12eb43b8fd
Merge branch 'CURA-5769_gcode_retraction'
2018-10-24 16:14:05 +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
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
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
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
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
Lipu Fei
ea9aa2c777
Add doc for using setCompatibleMaterialDiameter() in QML
...
CURA-5834
2018-10-22 10:56:11 +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
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
