GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 05:03:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,220 Commits 289 Branches 260 Tags
Commit Graph

230 Commits

Author SHA1 Message Date
Ghostkeeper
33a20fb10b
Merge branch '4.6' 2020-04-15 18:37:24 +02:00
Ghostkeeper
9f38374960
Also track Z coordinates and retract extra for the distance travelled then 
Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way.

Fixes #7458.
 2020-04-15 18:37:13 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables 2020-04-10 13:46:19 +02:00
Jaime van Kessel
6a6ad6e815
Remove unneeded semicolons 2020-04-10 13:34:57 +02:00
Ghostkeeper
d5166030d7
Don't detect retractions if E is almost equal, but rounding errors 
Contributes to issue CURA-7351.
 2020-04-09 11:27:40 +02:00
Ghostkeeper
9b997d421b
Keep current_e updated even if not finding retractions 
Otherwise the new E is never going to be lower than the current E. I don't know how this ever worked then.

Contributes to issue CURA-7351.
 2020-04-09 11:22:05 +02:00
Ghostkeeper
d9649dc3dd
Reduce indentation and complexity by using a pre-check 
Contributes to issue CURA-7351.
 2020-04-09 11:03:10 +02:00
Jaime van Kessel
329c5c5c11
Rename pause duration to disarm timeout and set default to give same behavior as before 
The name wasn't really covering what it was doing. It wasn't setting the duration of the
pause, it was setting the timeout for the stepper disarm.
Also, ive set the defaults so that the behavior remains the same, unlesss a user
explicitly enables this

CURA-7331
 2020-03-30 17:20:59 +02:00
Jaime van Kessel
4682b9c4ae
Merge branch 'pp-plugin_pause-a-h_disarm' of https://github.com/ilyko96/Cura 2020-03-30 17:12:54 +02:00
Nino van Hooff
ddd7d15287 Attempt to appease mypy 2020-03-26 09:45:26 +01:00
Nino van Hooff
3bb3b69082 Attempt to appease mypy 2020-03-25 17:32:41 +01:00
Nino van Hooff
92f278acc8 Change trusted scripts path from resources to plugin/scripts 
CURA-7319
 2020-03-25 16:54:43 +01:00
Jaime van Kessel
dec68002bc
Use patch.object to temporarily replace mock a function call 
CURA-7319
 2020-03-25 12:35:15 +01:00
Jaime van Kessel
d5b58cf3b4
Add missing typing 2020-03-25 11:47:38 +01:00
Nino van Hooff
c0d2977f4d Cleanup test_enterprise_signed_user_script_allowed 
CURA-7319
 2020-03-24 16:28:43 +01:00
Nino van Hooff
5b045f89b1 Finish postprocessing script signature checking 
CURA-7319
 2020-03-24 16:24:24 +01:00
Nino van Hooff
7f89c7e740 Merge branch 'master' into ppscript_pre_secure 2020-03-24 11:37:53 +01:00
Ilia Mazlov
5b85dae926 PP-plugin -> PauseAtHeight: steppers disarm timout 2020-03-04 16:49:35 +01:00
fieldOfView
00f406b5dd Add list of active scripts to tooltip 2020-02-28 22:51:37 +01:00
fieldOfView
0f662da2c3 Show the number of active postprocessing scripts 2020-02-28 22:29:20 +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
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1 
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
 2020-02-10 10:45:07 +01: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
Remco Burema
935c71edda
Fix name/file-location oops. 2020-01-17 17:25:00 +01:00
Remco Burema
fe2098376f
Prepare PostProcessingPlugin for security. 2020-01-17 17:15:37 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Jaime van Kessel
523b4e96a8
Ensure that post processing scripts are correctly reloaded on project loading 
Previously it would not re load post processing plugins if it was updating an existing machine

Fixes #6881
 2020-01-07 10:45:57 +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
Nino van Hooff
c62ff262ed Change SDK version to 7.0.0 
CURA-6858
 2019-10-21 14:51:34 +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