Lipu Fei
49bd249819
Update text for USB printing exit confirmation
...
CURA-5384
2018-07-13 11:10:15 +02:00
Lipu Fei
c0b7e40b0d
Add on-exit callback management and check for active USB printing
...
CURA-5384
2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0
Revert "Added signal to prevent window closing if USB printer is printing"
...
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
2018-07-13 08:08:56 +02:00
Diego Prado Gesto
e88362930d
CURA-5562 Don't trigger the stop slicing if some nodes without build
...
plate associated with it changes in the scene, such as the NozzleNode in
the SimulationView.
2018-07-12 14:34:42 +02:00
jack
461b191648
Merge pull request #4044 from Ultimaker/remove-package-check
...
CURA-5389 Check and confirmation before Remove package
2018-07-12 14:15:13 +02:00
Jack Ha
2bd8350141
Added error checking, added typing, renamed function. CURA-5389
2018-07-12 14:06:34 +02:00
Aleksei S
995a95b8ab
Merge branch 'master' of github.com:Ultimaker/Cura
2018-07-11 13:24:12 +02:00
Aleksei S
596a7b7169
Added signal to prevent window closing if USB printer is printing
...
CURA-5384
2018-07-11 13:23:30 +02:00
Jack Ha
993dd7a90e
Check for None instead of evaluating the variable as True/False.
2018-07-11 11:34:31 +02:00
Ian Paschal
6a5c0b608d
Fix missing layer view
2018-07-11 11:24:16 +02:00
Lipu Fei
af02dc2758
Only use setMetaDataEntry()
2018-07-11 11:14:57 +02:00
Lipu Fei
76417b7fb2
Hide materials belong to a to-be-removed package
2018-07-11 10:57:57 +02:00
Lipu Fei
5255d6ca2a
Better height for dialog
2018-07-10 16:11:56 +02:00
Lipu Fei
3a1d57a725
Increase dialog height
2018-07-10 15:32:39 +02:00
Lipu Fei
328fd9081e
Merge remote-tracking branch 'origin/master' into remove-package-check
2018-07-10 14:57:46 +02:00
Lipu Fei
cc5f35dd91
Rename some functions and variables
2018-07-10 14:57:01 +02:00
Ghostkeeper
c4236d375b
Merge branch '3.4'
2018-07-10 13:01:51 +02:00
Ghostkeeper
33f7430798
Update change log for Cura 3.4.1
2018-07-10 12:03:59 +02:00
Ian Paschal
d709650def
Try to ignore _process variable
2018-07-10 11:04:17 +02:00
Ian Paschal
8dab2a6696
Do not attempt to discard changed build plates
2018-07-09 15:33:41 +02:00
Jack Ha
aa0c7d5f0a
Confirm uninstall reset dialog now has proper sizing. CURA-5389
2018-07-09 13:26:11 +02:00
Ian Paschal
1c1b45541f
Merge branch 'master' into fix_tests_cura_engine_backend
2018-07-09 12:38:54 +02:00
Ian Paschal
413965a0ee
Fighting muscle memory
2018-07-09 11:51:53 +02:00
Ghostkeeper
f59f23c027
Fix sending print job name via USB
2018-07-09 11:41:02 +02:00
Ghostkeeper
dec9d7cac6
Still store disabled extruders as a set
...
They should be unique anyway.
Contributes to issue CURA-5456.
2018-07-09 11:32:53 +02:00
Ian Paschal
ac0192f01f
Improve fixes
2018-07-09 11:29:25 +02:00
Jack Ha
bff9a3afb5
Merge branch 'master' into remove-package-check
2018-07-09 11:25:19 +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
Lipu Fei
1fdac63168
Merge pull request #4038 from Ultimaker/CURA-5545_fix_3mf_reader
...
CURA-5545 Fix 3MF Reader
2018-07-09 11:00:13 +02:00
Lipu Fei
853266e8a8
Fix upgrade from 3.4 to 4.0
2018-07-09 10:58:04 +02:00
Jack Ha
5af5aa9e35
Added reset profiles/materials and uninstall functionality and dialog. CURA-5389
2018-07-09 09:57:31 +02:00
Ghostkeeper
533bd1a79c
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
...
Contributes to issue CURA-5491.
2018-07-09 09:47:49 +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
Lipu Fei
9c40b1de92
Remove code that is likely for debugging
...
CURA-5545
2018-07-06 15:13:07 +02:00
alekseisasin
a499a6bb66
Merge pull request #4027 from Ultimaker/feature_prime_tower_shells
...
Prime Tower Shells
2018-07-06 14:39:29 +02:00
Ian Paschal
c6b290e1e5
Fix broken slicing
2018-07-06 11:03:32 +02:00
Ian Paschal
b8a670a15a
Merge branch 'fix_tests_cura_engine_backend' of https://github.com/Ultimaker/Cura into fix_tests_cura_engine_backend
2018-07-06 11:03:20 +02:00
Mark
8e7399c442
Add correct typing
2018-07-06 10:56:09 +02:00
Ian Paschal
2c291e02be
Revert "Fixes for StartSliceJob"
...
This reverts commit 9ec5770a1c2f64c50aee6a279645320e5bff8fe0.
2018-07-06 10:54:24 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend
2018-07-06 09:48:07 +02:00
Mark
183cd0182d
Merge pull request #4028 from Ultimaker/fix_style
...
Fix code style
2018-07-05 21:22:53 +02:00
Ian Paschal
b6364b2804
Fixes for X3DReader
2018-07-05 16:35:57 +02:00
Ian Paschal
3321b23925
Fixes for UM3NetworkPrinting
2018-07-05 16:31:56 +02:00
Ghostkeeper
96896088c3
Add spaces around equals operators
...
As per our code style regulations.
2018-07-05 16:27:52 +02:00
Ian Paschal
85be9cea07
Fixes for Toolbox
2018-07-05 16:06:37 +02:00
Ian Paschal
cfae634061
Fixes for SliceInfo
2018-07-05 15:54:21 +02:00
Ian Paschal
d0c68f8e94
Fixes for WindowsRemovableDrivePlugin
2018-07-05 15:46:16 +02:00
Ian Paschal
2f8debc985
Fixes for FlavorParser
2018-07-05 15:45:48 +02:00
