GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 05:37:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,302 Commits 290 Branches 260 Tags
Commit Graph

12302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
b68a30662a Add stubs to PrinterOutputController 2018-01-17 21:21:13 +01:00
fieldOfView
7994c95bbe Add unit to preheat temperature boxes 2018-01-17 18:03:01 +01:00
fieldOfView
6e0717a967 Merge branch 'master' into feature_preheat_extruder 2018-01-17 17:36:40 +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 8dd21892d33277bec88895393f992b612b7af526.
 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
Lipu Fei
4bc488ca79 Change wording to "Aluminium" 
CURA-4461
 2018-01-17 10:50:48 +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 4abbd4b9887fc3e3d98ebf06481d2b21a9e9be0e 2018-01-16 15:36:57 +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 225b03e98ee1d92467176a1fd1ef3605ce0999c7 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
Jack Ha
71e4d42409 CURA-4795 set build plate of newly loaded 3mf files to active build plate 2018-01-16 10:47:30 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Diego Prado Gesto
cd4b162b86 CURA-4461 Change sizes and theme colors for the separator 2018-01-16 09:47:33 +01:00
Jaime van Kessel
6225c12a9e Fixed crash on complete message 
In some cases a job won't have an assigned printer when it's done.

CL-716
 2018-01-16 09:44:18 +01:00
Ghostkeeper
0007f3dafd
Merge branch '3.2' 2018-01-16 09:28:40 +01:00
Ghostkeeper
39aec54a56
Fix reference to Tevo Black Widow model 
Also fix some whitespace mistakes according to code style. Lots of tabs in there, whitespace at the end of a line, brackets on the same line, etc.
 2018-01-16 09:28:29 +01:00
Ghostkeeper
8aa51658e2
Decimate Tevo Black Widow model 
The original file size was too big. This is much better.
 2018-01-16 09:28:29 +01:00
Diego Prado Gesto
a7beb142ff CURA-4461 Add line separator when the build plate selector is visible 2018-01-16 09:23:39 +01:00
Diego Prado Gesto
aace0e0317 CURA-4461 Remove unused code 2018-01-15 18:10:52 +01:00
Diego Prado Gesto
0f497545bc CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes 2018-01-15 18:00:49 +01:00
Aleksei S
9a3c9921ca Fix: remove unnecesary cura slice request 
CURA-4785
 2018-01-15 17:21:43 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes 
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
 2018-01-15 16:41:33 +01:00
Diego Prado Gesto
e51eaab08e CURA-4461 Don't allow Cura to Slice when the buildplate is not compatible with the material 2018-01-15 16:33:15 +01:00
Aleksei S
38ae75637a Revert "Fix: Cura update setting after delay" 
This reverts commit f823a98708dd3eed2485ff412d3fe2dd03a31f35.
 2018-01-15 16:15:36 +01:00