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

157 Commits

Author SHA1 Message Date
Jaime van Kessel
d8c430abf6 Fix typing 2018-11-27 17:54:53 +01:00
N95JPL
10643da56c Update DisplayFilenameAndLayerOnLCD.py 2018-11-19 13:09:20 +00:00
N95JPL
1ae0728c9f
Modified "Display Filename And Layer On LCD" 
This is a modified Display Filename And Layer On LCD script to offer a wider range of optional information.
Tried and tested on a Tevo Tornado (Running Marlin 2.x.x)
2 new options
- Scroll (If scrolling LCD is enabled)
- Max Layer (To display "Printing [name] - Layer # of ###")
 2018-11-16 00:10:30 +00: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
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Jaime van Kessel
e3861b0d90 Add few more elide properties to ensure text doesnt' overlap 2018-10-10 12:48:22 +02:00
Lipu Fei
cc34e14215 Use ElideRight for long script names 
CURA-5683
 2018-10-10 11:52:16 +02:00
Jaime van Kessel
9e5b72c5b6 Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura 2018-10-08 16:41:29 +02:00
fieldOfView
9ac744b9ba Remove unnecessary import and declaration of i18n in plugins 2018-10-03 22:00:24 +02:00
Jaime van Kessel
adf8285d20 Typing fixes 
Since I was stupid enough to touch it, I was also forced to boyscout the code.
 2018-10-03 16:36:58 +02:00
Jaime van Kessel
2e529452dd Moved the actual adding of containers by script to initialize 
This ensures that when loading scripts (and checking they are valid) we don't start adding unneeded containers
 2018-10-03 15:58:16 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Wayne Porter
821a4dea67 Fix begin and end comments 
Signed-off-by: Wayne Porter <wporter82@gmail.com>
 2018-09-26 14:00:36 -07:00
Wayne Porter
f3ad17af85 Remove G90 and assume absolute positioning 
Signed-off-by: Wayne Porter <wporter82@gmail.com>
 2018-09-26 13:54:09 -07:00
Wayne Porter
03c0faaeca Add beginning and end gcode comments 
Signed-off-by: Wayne Porter <wporter82@gmail.com>
 2018-09-26 13:39:55 -07:00
Wayne Porter
26bbf3ef0e Fix bug when parking nozzle 
Signed-off-by: Wayne Porter <wporter82@gmail.com>
 2018-09-26 13:33:28 -07:00
Wayne Porter
2502d47413 Fix tab/space mixing 
Signed-off-by: Wayne Porter <wporter82@gmail.com>
 2018-09-26 11:24:26 -07:00
Lipu Fei
ccef0843c2
Merge pull request #4273 from Kriechi/pause-at-height-rrf 
add PauseAtHeight post-processing script for RRF
 2018-09-13 15:11:30 +02:00
Wayne Porter
2e77293204 Add wait for moves to finish to timelapse script 2018-09-11 13:19:40 -07:00
Wayne Porter
eb3670dd93 Make timelapse head parking optional 2018-09-11 08:28:55 -07:00
Wayne Porter
256aef30c9 Move post processing scripts to correct location 2018-09-11 08:03:26 -07:00
Wayne Porter
74a6d31c74
Add time lapse post processing plugin 2018-09-10 15:30:52 -07:00
Wayne Porter
2715a20922
Add insert gcode at layer change to PostProcessingPlugin 2018-09-10 12:25:01 -07:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Amanda de Castilho
7e7f2aab6b
Update DisplayFilenameAndLayerOnLCD.py 2018-08-29 09:48:37 -07:00
Amanda de Castilho
f7fbc685d8
Update DisplayFilenameAndLayerOnLCD.py 
changed so that actual filename is displayed (or alternatively user can enter text to display) to LCD during print
 2018-08-29 08:43:16 -07:00
Amanda de Castilho
a5baa90086
Rename DisplayFilenameAndLayerOnLCD to DisplayFilenameAndLayerOnLCD.py 
added the .py extention
 2018-08-29 08:09:57 -07:00
Amanda de Castilho
6dbf0a5fb7
Create DisplayFilenameAndLayerOnLCD 
This plugin inserts M117 into the g-code so that the filename is displayed on the LCD and updates at each layer to display the current layer
 2018-08-29 00:39:13 -07:00
Aleksei S
fe9cada459 Increase plugin API version to 5 
CURA-5627
 2018-08-27 13:59:00 +02:00
Ghostkeeper
45e3355318
Catch failure to parse QML component 
Don't crash the application then.
 2018-08-27 10:57:58 +02:00
Thomas Kriechbaumer
afb4440d64 add PauseAtHeight post-processing script for RRF 2018-08-22 13:46:49 +02:00
Ghostkeeper
6740c2bee9
Fix offset of initial layer height 
It would detect the height of the raft by looking at what the first Z coordinate is that it encounters on layer 0. This Z coordinate also includes the initial layer height though. If you pause lower than the initial layer height (but higher than 0), you'd expect to pause in the initial layer.
 2018-08-17 11:24:39 +02:00
Jack Ha
b8ec1d0fa7 In relative mode, the feedback is still absolute and not relative. CURA-5480 2018-08-01 10:52:31 +02:00
Aleksei S
fca51ac41f Set relative after getting to line G91 2018-07-25 13:44:58 +02:00
Lipu Fei
952bc54452 Make stretch script work with relative movements 
CURA-5480
 2018-07-24 15:59:02 +02:00
Diego Prado Gesto
296b74b032 Set negative values to retraction in the filament change script. 
Fixes #4114
 2018-07-24 10:48:52 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Ghostkeeper
54b990c0bd
Retract further if we can't set the temperature to stand-by temp 
Because we can't set the temperature and we don't know the correct temperature to set it back to, we will just retract further in order to prevent damage to the material.

Contributes to issue CURA-5491.
 2018-07-09 11:21:34 +02:00
Ghostkeeper
41857338cb
Use firmware retraction and temperature control settings 
Instead of deriving this from the g-code flavour, just use the actual settings that are made to control these two properties.

Contributes to issue CURA-5491.
 2018-07-09 09:27:11 +02:00
Ghostkeeper
b67339c3bf
Merge branch 'CURA-5491-pause-at-height' 
Contributes to issue CURA-5491.
 2018-07-09 09:17:49 +02:00
Ghostkeeper
6977b8de6e
Make getValue return an int if it's an integer number 
This is a more generic solution to what's done in 7058ddbb66084bee9cd507ed69f031ec1262163e.

Contributes to issue CURA-5491.
 2018-07-09 09:01:52 +02:00
Ghostkeeper
96896088c3
Add spaces around equals operators 
As per our code style regulations.
 2018-07-05 16:27:52 +02:00
Jack Ha
b77220b260 Add more ultigcode retract and unretract. CURA-5491 2018-07-03 13:41:14 +02:00