Ghostkeeper
afcf35cb0e
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2
2018-01-18 13:25:16 +01:00
Ghostkeeper
dc08e7f043
Merge branch 'mb-move-wall-order-opt-setting' of https://github.com/smartavionics/Cura into smartavionics-mb-move-wall-order-opt-setting
2018-01-18 13:23:16 +01:00
Jack Ha
1796a182fa
CURA-4525 fix crashing cura due to empty build plate
2018-01-18 11:54:30 +01:00
Torbjørn
53cc4efb23
last minute tweaks
...
Decreased jerk and acceleration
2018-01-18 09:42:36 +01:00
ChrisTerBeke
5e99fd6c1e
Fixes for print information when running in headless mode
2018-01-18 09:05:40 +01:00
Torbjørn
66805f83fd
Small tweaks for default quality
...
To better match printers after some testing
2018-01-18 08:46:27 +01:00
Lipu Fei
dd8d21fd34
Merge pull request #3147 from fieldOfView/fix_menu_errors
...
Fix QML errors building the material and nozzle menus
2018-01-18 08:41:42 +01:00
Torbjørn
9530d5a3d3
Merge branch 'master' of https://github.com/thetobby/Cura
2018-01-18 08:41:34 +01:00
Brecht Nuyttens
64a7d1bbda
Removed ID + minor change
2018-01-18 08:34:10 +01:00
fieldOfView
259b1091f6
Fix QML errors building the material and nozzle menus
...
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
2018-01-17 19:36:20 +01:00
ChrisTerBeke
422d047317
Merge branch 'master' into feature_headless_docker
2018-01-17 17:02:04 +01:00
Ian Paschal
013f020a4a
Initial styling changes
...
- Dual-button layout
- Blue buttons in line with Cura styles
- Contact info
2018-01-17 17:02:02 +01:00
ChrisTerBeke
4d0eaf6093
Merge branch 'feature_headless_docker' of https://github.com/Ultimaker/Cura into feature_headless_docker
2018-01-17 17:01:58 +01:00
Jack Ha
8a53549bce
CURA-4033 split update bounds for a single node in buildvolume and also call it from readMeshFinished
2018-01-17 17:01:03 +01:00
Diego Prado Gesto
4ee36404cc
Merge branch '3.2'
2018-01-17 14:35:07 +01:00
Diego Prado Gesto
5c0e2d39a3
Avoid zero thickness to be shown in layer view.
2018-01-17 11:54:22 +01:00
Diego Prado Gesto
e6169a7c61
Fix some typos
2018-01-17 11:53:31 +01:00
ChrisTerBeke
c1308de753
Merge branch '3.2'
2018-01-17 11:40:06 +01:00
Diego Prado Gesto
cc89ddf5f7
Revert "Avoid zero thickness to be shown in layer view."
...
I saw that with these changes, Cura crashes when loading a GCode.
This reverts commit 8dd21892d3
.
2018-01-17 11:39:38 +01:00
Diego Prado Gesto
8dd21892d3
Avoid zero thickness to be shown in layer view.
...
Also fix some typos.
2018-01-17 11:34:25 +01:00
Jaime van Kessel
4680996a49
Print window no longer gets an ever increasing list of print targets
...
CL-720
2018-01-17 11:32:43 +01:00
Diego Prado Gesto
26371c9c3a
CURA-4815 When creating the unique name for a machine, don't look at the
...
definition instance container for the id, just look at the container
stack ids.
2018-01-17 10:57:11 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP
...
Feature: Printers with different build plates
2018-01-17 10:55:46 +01:00
Brecht Nuyttens
746fd3ddcb
Updated definition and added qualities
...
Updated the definition and added qualities for the 4 filaments.
2018-01-17 10:54:04 +01:00
Lipu Fei
4bc488ca79
Change wording to "Aluminium"
...
CURA-4461
2018-01-17 10:50:48 +01:00
Brecht Nuyttens
93741bffb5
Merge remote-tracking branch 'refs/remotes/Ultimaker/master'
2018-01-17 10:47:45 +01:00
Ian Paschal
fad43be23b
Fixes CURA-4789
...
Emits `sceneChanged` which `PrintInformation` listens for and then resets with. Same result re: print time, but also will update anythign else which is listening for `sceneChanged`.
2018-01-16 17:03:52 +01:00
Ian Paschal
ba1f915633
Fix for CURA-4789
...
`deleteAll()` within `CuraApplication.py` now resets the print information by calling its `setToZeroPrintInformation()` method, rather than by reinstatiating the `PrintInformation` class.
2018-01-16 16:30:10 +01:00
Jack Ha
07f0906b1c
Merge branch '3.2'
2018-01-16 16:05:38 +01:00
Jack Ha
cffeff0299
CURA-4805 remove modifiable settings when loading non sliceable file (gcode)
2018-01-16 15:58:14 +01:00
Jack Ha
fc2cbb61fa
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2
2018-01-16 15:37:02 +01:00
Jack Ha
54698ada7f
CURA-4807 fix not choosing 'not supported' if there are valid options after changing variant; partly undoing 4abbd4b988
2018-01-16 15:36:57 +01:00
ChrisTerBeke
cbd6a996fa
Remove unused Signal import
2018-01-16 15:10:46 +01:00
ChrisTerBeke
02b681a8f2
Fixes for slicing
2018-01-16 15:10:16 +01:00
Lipu Fei
b0d2ef0f72
Correct default material diameter value for single-extrusion machines
...
CURA-4812
2018-01-16 15:04:21 +01:00
Ghostkeeper
cbf9a08c6e
Merge branch '3.2'
2018-01-16 13:45:11 +01:00
Ghostkeeper
f948203a63
Fix crash when clearing build plate
...
We shouldn't delete the singleton PrintInformation object. We should rather just zero out the print information. And instead of doing that explicitly in deleteAll, listen to scene changes from PrintInformation in order to keep the logic related to the print information contained within its class.
Contributes to issue CURA-4810.
2018-01-16 13:44:49 +01:00
Lipu Fei
51b49c89f4
Switch to LayerView after GCode has been fully loaded
...
CURA-4805
2018-01-16 13:09:35 +01:00
Diego Prado Gesto
0a4c30603f
Change style of Add/Remove printers link in Monitor tab
2018-01-16 13:07:27 +01:00
Diego Prado Gesto
4c29a952eb
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-01-16 11:59:06 +01:00
Diego Prado Gesto
aa8057e80c
Change style of Add/Remove printers link in Monitor tab
2018-01-16 11:57:39 +01:00
Lipu Fei
8a570c4b01
Show user profiles based on Not Supported
...
CURA-4807
2018-01-16 11:57:20 +01:00
Lipu Fei
abece3c415
Add quality_type = not_supported to empty_quality_changes
...
CURA-4807
2018-01-16 11:57:20 +01:00
Jack Ha
2d9e25312e
Merge branch '3.2'
2018-01-16 11:50:00 +01:00
Jack Ha
a0738c2977
CURA-4808 fix extruder setting change trigger slice. re-introduce extrudersAdded signal, probably needed because of timing issues (extruder added after loading global container). it's the inversion of 225b03e98e
2018-01-16 11:49:45 +01:00
Jack Ha
a84d17dee4
Merge branch '3.2'
2018-01-16 10:57:30 +01:00
Ghostkeeper
27c0ca4dea
Move some things outside of try-catch clause
...
Only the pre-read should really be in there. Otherwise we'd hide some mistakes in our code.
Contributes to issue CURA-4810.
2018-01-16 10:53:14 +01:00
Ghostkeeper
1e892dc45c
Remove unused variables
...
Contributes to issue CURA-4810.
2018-01-16 10:53:14 +01:00
Ghostkeeper
063eb8e5cd
Don't give an error when reading normal 3MF files
...
We have a signalling return value for this case. Let's use it.
Contributes to issue CURA-4810.
2018-01-16 10:53:02 +01:00
Jack Ha
24eff5f8b8
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2
2018-01-16 10:47:38 +01:00