GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,835 Commits 287 Branches 260 Tags
Commit Graph

146 Commits

Author SHA1 Message Date
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
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
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
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
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
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Jaime van Kessel
384c359db1 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-30 15:34:47 +01:00
Mark
90aa8c1264 point people to a good example 2018-11-29 15:29:51 +01:00
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6 Fix typing 2018-11-27 17:54:53 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Ghostkeeper
163f102dda
Make extension menu items translatable 
If these extension plug-ins don't set their menu names, the plug-in name is used as the menu name. The plug-in names are not translated, so this appears as an untranslated string then.
 2018-11-15 09:38:14 +01:00
griehsler
3a84a5868f
Merge branch 'master' into master 2018-10-31 21:44:44 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +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
griehsler
5ae5dfd3ad added x_position and y_position to postprocessing filamentchange parameters 2018-10-20 01:28:48 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion 
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
 2018-10-19 09:55:23 +02:00