GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,894 Commits 288 Branches 260 Tags
Commit Graph

144 Commits

Author SHA1 Message Date
fieldOfView
fa613c35eb Hide unused temperature for Repetier 2020-03-20 13:39:00 +01:00
fieldOfView
c87ee61e9c Add repetier-specific parking if repetier flavor is selected 2020-03-20 13:35:48 +01:00
fieldOfView
87633e7818 Make Griffin a selectable method instead of snooping it from gcode 2020-03-20 12:56:07 +01:00
fieldOfView
a7e23ba99e Use an appropriate default for the pause method... 
based on the machine gcode flavor and machine name
 2020-03-20 10:54:43 +01:00
fieldOfView
bf7d566111 Remove flavor-specific pause scripts 2020-03-01 16:01:20 +01:00
fieldOfView
a0a353e33c Add option to set pause method gcode command 
Contributes to #7198
 2020-03-01 16:00:02 +01:00
Tim Kuipers
0f4ff1f149 lil: fix naming and spacing to fit code conventions 2020-02-26 15:37:25 +01:00
Tim Kuipers
14d351e185 Merge branch 'master' of https://github.com/Hrybmo/Cura into Hrybmo-master 2020-02-26 15:31:58 +01:00
John Hryb
9aa6887b02 Update ColorMix.py 
Updates based on review.
 2020-02-22 11:58:19 -05:00
Matt Jani
81429f8985 Cleaned up timelapse post processing script (issue #6730) 2020-02-03 15:19:11 +01:00
Matt Jani
155408d77d Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b Fixed wrong extrusion (issue #6730) 2020-01-28 15:26:43 +01:00
Kostas Karmas
a720939e64 Fix max layer to correspond to starting layer 
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
 2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master 
Update DisplayFilenameAndLayerOnLCD.py
 2020-01-27 14:08:26 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Johnathan Chu
1f2e079185 Update DisplayFilenameAndLayerOnLCD.py: 
- Fixed filename appearing in middle of text when scrolling is disabled and displaying max layer.
- Fixed filename appearing twice when scrolling is enabled and displaying max layers.
 2020-01-06 21:45:43 -08:00
John Hryb
1b976ca636 Update ColorMix.py 
Updated colorMix to latest
 2019-12-14 14:26:52 -05:00
Lipu Fei
849ac3551d
Merge branch 'master' into master-1 2019-12-11 10:57:50 +01:00
Ghostkeeper
250774c4cd
Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master 2019-12-05 11:19:42 +01:00
translucentfocus
4fc32b036e
Fixed typo 
Only correcting in master; may want to consider correcting in other branches
 2019-11-27 11:46:07 -06:00
Mathias Lyngklip Kjeldgaard
8835a0cb99 Fixed a typo in the title 
I noticed a typo in the title of the plugin, so that is fixed. I also
added more info to the description.
 2019-11-26 20:20:45 +01:00
Remco Burema
432ed02aa6
Fix skip (or late) pause at height. 
Previously, the line after the layer change would also contain the z height.
If not found, the could would break the per-line reading, and skip to the next layer.
However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses).
I just ignored the optimization and made it a continue.
I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once.

CURA-6965
 2019-11-21 14:08:51 +01:00
Jaime van Kessel
de13317b9e
Merge pull request #6101 from iLyngklip/master 
Create DisplayRemainingTimeOnLCD.py
 2019-10-24 15:14:24 +02:00
Ghostkeeper
c875252b53
Fix some mistakes indicated by PyCharm's linting 2019-10-15 15:27:58 +02:00
Lipu Fei
af1a03d02f
Merge pull request #6400 from Ultimaker/CURA-6799_pause_at_height_resume_speed 
Cura 6799 pause at height resume speed
 2019-09-25 08:01:13 +02:00
Nino van Hooff
2fa4230d1c Only consider feedrates for extrusions (Pause At Height) 
CURA-6799
 2019-09-24 16:11:00 +02:00
Nino van Hooff
2a488b48e9 Restore feedrate at end of Pause at Height script for Repetier. 
CURA-6799
 2019-09-23 16:31:24 +02:00
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script 
CURA-6799
 2019-09-23 16:10:27 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Remco Burema
756c21cd19 Remove extra empty lines in ChangeAtZ-scipt output. 2019-09-13 13:33:06 +02:00
Jaime van Kessel
8c893caf9f
Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script 
Add retract-continue script
 2019-09-09 13:05:33 +02:00
Ghostkeeper
f5aa2921ff
Add space before comments 
Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them.

Fixes #6295.
 2019-09-06 14:35:29 +02:00
Ghostkeeper
b20e5bfd98
Don't display any message if setting is empty 
Contributes to issue CURA-6759.
 2019-09-06 12:42:15 +02:00
Ghostkeeper
c1b4bcebec
Add message while pausing 
This way you can display instructions during the print.

Implements issue CURA-6759.
 2019-09-06 12:41:09 +02:00
Ghostkeeper
138d76e7d9
Rename speed to ratio 
Contributes to issue CURA-6755.
 2019-09-06 11:46:59 +02:00
Ghostkeeper
2abda86162
Add retract-continue script 
Contributes to issue CURA-6755.
 2019-09-06 11:38:53 +02:00
B. Perry
6ed57838a9 Fixed PauseAtHeight.py to resume at starting height 2019-09-03 14:02:52 -06:00
Mathias Lyngklip Kjeldgaard
4934d7a6e9 Fixed a bug caused by ":" 
I discovered the ":" I added caused the rest of the message to not be
displayed when printing from a SD card, so I removed the ":".
 2019-08-08 11:03:24 +02:00
Ghostkeeper
8179e1ee90
Add typing 2019-08-01 11:06:22 +02:00
Mathias Lyngklip Kjeldgaard
fd3233dba5 updated variable names 2019-07-31 23:29:35 +02:00
Mathias Lyngklip Kjeldgaard
4067f5216e Create DisplayRemainingTimeOnLCD.py 
Added a post-processing script that prints out the estimated time remaining generated by Cura.
 2019-07-31 13:34:28 +02:00
Jaime van Kessel
004297b936
Merge pull request #6028 from sgtnoodle/stretch_retract 
Preserve extruder-only moves in post stretch script
 2019-07-24 17:05:41 +02:00
Jaime van Kessel
3e5d81ddb6 Merge branch 'patch-2' of https://github.com/adecastilho/Cura 2019-07-23 15:48:57 +02:00
Jaime van Kessel
5e94e51e0c Add default for max_layer setting in postprocessing script 2019-07-23 15:36:04 +02:00
Jaime van Kessel
a330ae12dc Merge branch 'patch-2' of https://github.com/N95JPL/Cura 2019-07-23 15:28:32 +02:00
Jeff Rogers
5ee31a1983 Preserve extruder-only moves in post stretch script 2019-07-18 16:52:59 -07:00
Ghostkeeper
24b1930b14
Don't erase G92 commands 
They should only be read in order to detect travel moves properly. They don't need to be modified in any way.

Fixes #4878.
 2019-06-03 11:17:04 +02:00
Cherubim
e1bb783bcd
Better bounds checking in layer numbers 2019-05-28 14:38:19 +02:00
Jaime van Kessel
26db08048b Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 11:03:38 +02:00
Jaime van Kessel
7d8c97dd7b ChangeAtZ no longer sets flow to -1 if no previous flow was found 
It makes a lot more sense to just asume the value is 100 than -1

Fixes #5284
 2019-05-20 11:02:40 +02:00