Jaime van Kessel
ad26962cb9
Fix setting visibility not working in settingVisibilityPage
...
CURA-5981
2018-11-30 15:49:50 +01:00
Jaime van Kessel
a4a619370e
Fix QML warnings
2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99
Merge branch 'remove_transitions' of github.com:Ultimaker/Cura
2018-11-30 15:30:53 +01:00
Jaime van Kessel
1a79372afd
Fixed name of cocoon create
...
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
2018-11-30 15:16:37 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script'
2018-11-29 15:33:03 +01:00
Mark
90aa8c1264
point people to a good example
2018-11-29 15:29:51 +01:00
Lipu Fei
c545d9df77
Add key check before accessing in StartSliceJob
...
CURA-5901
2018-11-29 15:17:43 +01:00
Mark
d88a465737
Increase possible visible description lines in the Marketplace
2018-11-29 14:45:42 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace
...
Show website for support
2018-11-29 08:50:32 +01:00
Lipu Fei
b44ddec01f
Change normal layer height of cocoon to 0.10
...
CURA-5902
So it's different from Fine 0.15, otherwise you get duplicates.
2018-11-29 08:35:40 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak
...
Improve monitor tab temporary scroll bar
2018-11-28 13:24:27 +01:00
Ian Paschal
14cee32cec
Improve monitor tab temporary scroll bar
2018-11-28 12:20:09 +01:00
Jaime van Kessel
7d42fdf183
Add missing typing
2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3
Gracefully handle the case where machine definition is no in the map
2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b
Removed accidental copy paste
2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities
...
CURA-5879 experimental qualities
2018-11-28 11:34:21 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
...
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Jaime van Kessel
d9c3faaae2
Codestyle
...
CURA-5879
2018-11-28 11:19:37 +01:00
Jaime van Kessel
d09d8a6ae3
Minor codestyle fixes
...
CURA-5879
2018-11-28 11:18:36 +01:00
Ian Paschal
9029d10ed0
Remove debug statement
...
Contributes to CL-1150
2018-11-28 10:47:34 +01:00
Ian Paschal
370fa0fd14
Remove old sidebar
...
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
Ian Paschal
d54a1cb41b
Handle null print job more elegantly
...
Contributes to CL-1150
2018-11-28 10:46:12 +01:00
Ian Paschal
255a7fa1fb
Fix binding loop
...
Contributes to CL-1150
2018-11-28 10:45:46 +01:00
Diego Prado Gesto
709750c9e2
Add global quality to the Anycubic i3 Mega
...
Fixes #4876 .
2018-11-28 10:39:32 +01:00
Jaime van Kessel
d8c430abf6
Fix typing
2018-11-27 17:54:53 +01:00
Lipu Fei
2c8ed99281
Add is_experimental to Qt models and QMLs
...
CURA-5879
2018-11-27 15:50:03 +01:00
Lipu Fei
c9c7ef7d67
Add "is_experimental" for experimental qualities
...
CURA-5879
2018-11-27 15:50:02 +01:00
Mark
b98df0f22f
Show one website link where to get the material
2018-11-27 15:46:23 +01:00
Mark
f8f498b90c
Increase the lines that are shown to 12
2018-11-27 15:45:58 +01:00
Mark
c7fd147f59
Show website for support
2018-11-27 14:55:06 +01:00
Jaime van Kessel
854755277c
Fix styling of comments
...
Because sentences should start with capitals
2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6
Prevent a KeyError from messing
...
CURA-5978
2018-11-27 14:34:29 +01:00
Diego Prado Gesto
a6a364c337
Move material diameter and machine nozzle size to the extruder
...
definition.
Contributes to CURA-5902.
2018-11-27 13:12:47 +01:00
Diego Prado Gesto
0794a2c8c9
Remove not needed printer and extruder definitions.
...
Contributes to CURA-5902.
2018-11-27 13:03:36 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
...
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Ian Paschal
fd723e1084
Improve camera icon
...
Contributes to CL-1150
2018-11-27 11:19:45 +01:00
Ian Paschal
a3f0630ee9
Rename printer images
...
Contributes to CL-1150
2018-11-27 11:19:30 +01:00
Ian Paschal
475a94d10d
Add printer images
...
Commit to CL-1150
2018-11-27 10:55:08 +01:00
Ian Paschal
8965695a59
Update MonitorPrintJobProgressBar.qml
...
Contributes to CL-1150
2018-11-27 10:54:46 +01:00
Ian Paschal
616ec13457
Change context menu button size
...
Contributes to CL-1150
2018-11-27 10:54:26 +01:00
Ian Paschal
7340b6dbc4
Update CameraButton.qml
...
Contributes to CL-1150
2018-11-27 10:53:00 +01:00
Ian Paschal
0cd9c8e087
Add machine images
...
Contributes to CL-1150
2018-11-27 10:52:49 +01:00
Diego Prado Gesto
f91dbd356d
Merge branch 'master' of github.com:Ultimaker/Cura
2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06
Merge branch 'pinchies-add-a-u20'
2018-11-27 09:50:43 +01:00
Diego Prado Gesto
39e1cfd6bc
Fix indentation.
...
Contributes to CURA-5902.
2018-11-27 09:50:01 +01:00
Lipu Fei
bd42136712
Fix GcodeStartEndFormatter to use fallback values
...
CURA-5901
Use values from the global stack (if exist) as fallback values.
2018-11-27 09:49:38 +01:00
Diego Prado Gesto
493b37b0fe
Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20
2018-11-27 09:44:11 +01:00
Lipu Fei
2e81b97623
Use global_stack.extruders to find extruders
...
CURA-5978
2018-11-27 08:45:45 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file....
2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops
2018-11-27 15:06:54 +11:00