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
24,910 Commits 288 Branches 260 Tags
Commit Graph

311 Commits

Author SHA1 Message Date
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
Jaime van Kessel
df75183eda Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 10:47:19 +02:00
Jaime van Kessel
5c33277d9a Correctly reset the script list on machine change 
Fixes #5747
 2019-05-20 10:46:47 +02:00
Ghostkeeper
abcac67cee
Improve wording of No. Layers setting 
Fixes #5741.
 2019-05-17 09:39:51 +02:00
Ghostkeeper
c9e7f3a245
Fix finding layer numbers 
That seems to have been unreliable. Luckily the original g-code is already broken up in layers, so searching it is completely unnecessary.

Hopefully resolves issue #5630.
 2019-05-06 11:47:13 +02:00
Ghostkeeper
cd89f7345a
Merge branch 'WIP_gitlab_ci' 2019-04-17 16:30:32 +02:00
Ghostkeeper
fdc629de32
Make error message log which layer could not be found 2019-04-15 13:17:31 +02:00
Lipu Fei
dd19d7d1a9 Fix typing 2019-04-03 08:25:17 +00:00
Jaime van Kessel
bcf6a21bc8 Merge branch 'patch-3' of https://github.com/adecastilho/Cura 2019-03-14 14:50:34 +01:00
Jaime van Kessel
31a8421fd4 Remove : from display script as it breaks on some machines 2019-03-13 17:06:47 +01:00
Jaime van Kessel
72eb90c7c1 Fix the insert & timelapse script so that you can use both at the same time 
CURA-5713
 2019-03-13 13:28:10 +01:00
Diego Prado Gesto
1eb1bce583
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:54 -05:00
Diego Prado Gesto
3b763e5552
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
OKay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:34 -05:00
Diego Prado Gesto
0875498a12
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:20 -05:00
Diego Prado Gesto
d19f1f497a
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:46:00 -05:00
Diego Prado Gesto
fadc8bb624
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:49 -05:00
Diego Prado Gesto
186e715d16
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:34 -05:00
Diego Prado Gesto
151d40664f
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
It's not functional, just a spot to put info if needed.

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:45:18 -05:00
Diego Prado Gesto
87154238a1
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:42:40 -05:00
Diego Prado Gesto
8086adf9ba
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:54 -05:00
Diego Prado Gesto
ad820ad1e9
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:35 -05:00
Diego Prado Gesto
986f9aa248
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:41:00 -05:00
Diego Prado Gesto
7921b89f3e
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:40:36 -05:00
Diego Prado Gesto
9fae1f29b1
Update plugins/PostProcessingPlugin/scripts/ColorMix.py 
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
 2019-03-09 20:40:11 -05:00
Diego Prado Gesto
9396628170 Make suggested changes to post processing scripts 
Contributes to CURA-5713.
 2019-03-08 15:46:21 +01:00
Diego Prado Gesto
b913dd9702 Merge branch 'master' of https://github.com/wporter82/Cura into wporter82-master 2019-03-08 15:37:41 +01:00
Amanda de Castilho
82466785ad
Update and rename UsePrevProbeMeasure.py to UsePreviousProbeMeasurements.py 
Applied suggested changes
 2019-03-06 12:54:57 -08:00
Diego Prado Gesto
a0888ccc0c
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:36 -08:00
Diego Prado Gesto
6e011352af
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:25 -08:00
Diego Prado Gesto
8a45a4e06f
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:09 -08:00
Diego Prado Gesto
8f2a2f3ae9
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:30:14 -08:00
John Hryb IV
3a979903aa
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1 
Marlin Commands:
M163 - Set Mix Factor
M164 - Save Mix
Ability to set a mix ratio or blend at a defined layer or distance.
Based on Geeetech's Color mixing software.
 2019-02-19 23:40:36 -05:00
Ghostkeeper
5592d4fa60
Don't make retraction distance negative 
Apparently this got changed accidentally because of a merge in an unfortunate time.
 2019-02-04 08:25:35 +01:00
Ghostkeeper
3018b1b3d4
Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master 2019-02-04 08:22:55 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel 
CURA-6097
 2019-01-10 16:32:43 +01:00
Amanda de Castilho
e04dc2dcb1
Create UsePrevProbeMeasure.py 
I wrote this plugin to override the G29 in the start code. When used, instead of probing the bed, it retrieves the last probing measurement from EEPROM and ensures bed leveling is activated.
 2019-01-05 19:40:31 -08:00
Nico Salvador
39cdb3ed0a
Fixed typo in ChangeAtZ.py 2019-01-06 10:19:21 +08:00
griehsler
9bc63fb1f9 Merge remote-tracking branch 'upstream/master' 2019-01-04 23:57:58 +01:00
Amanda de Castilho
de95d4f021
Update DisplayFilenameAndLayerOnLCD.py 
updated to display layer count before filename (layer number was getting cut off in event of long filename).
updated to include option to start layer count at either 0 or 1.
removed ':' in the display string as it is a gcode command that was splitting the line into two different commands.
 2019-01-03 21:00:50 -08:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
195d39f698 Update the style of the postprocessing button 
CURA-6043
 2019-01-03 09:47:48 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Jaime van Kessel
f2719ef582 Fix identation for postProcessing plugin settings 
CURA-6043
 2018-12-19 14:09:07 +01:00
Jaime van Kessel
9e867f8077 Fix the codestyle and cleanup the QML a bit 
CURA-6043
 2018-12-19 13:53:34 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions 
CURA-6019
 2018-12-17 13:03:21 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6 
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
 2018-12-14 17:29:02 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00