GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,338 Commits 295 Branches 268 Tags
Commit Graph

12338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torbjørn
5164065f58
Merge pull request #6 from Ultimaker/master 
resync
 2018-01-16 10:39:44 +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
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +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
Aleksei S
8498946de1 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-15 15:40:10 +01:00
Aleksei S
f823a98708 Fix: Cura update setting after delay 
CURA-4785
 2018-01-15 15:39:25 +01:00
Lipu Fei
616615067c Fix quality name in selected profile box 
CURA-4796
 2018-01-15 15:17:15 +01:00
Lipu Fei
9a5b215814 Do not show not supported when there are supported profiles 
CURA-4796
 2018-01-15 15:16:43 +01:00
Lipu Fei
784707bb85 Stay on the same build plate after everything is removed 
CURA-4795
 2018-01-15 14:42:22 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2 
Fix for CURA-4789
 2018-01-15 14:41:23 +01:00
Ian Paschal
5280501660 Fix for CURA-4789 
`deleteAll()` within `CuraApplication.py` used to only delete all scene nodes but now also resets the print information, as deleting all scene nodes _should_ do that by default. Timer now resets to 0, and project name is reset.
 2018-01-15 14:40:01 +01:00
Diego Prado Gesto
badf5a9043 CURA-4461 Store buildplate compatibility in the material profile 2018-01-15 14:31:52 +01:00
Lipu Fei
03bd4d8d22 Fix profile menu text for custom profiles based on not supported 
CURA-4796
 2018-01-15 14:29:52 +01:00
Lipu Fei
a3c2635648 Fix profile manager to support not supported custom profiles 
CURA-4796

Profile manager should be able to show custom profiles that are based on
the not supported profile correctly.
 2018-01-15 14:29:52 +01:00
Lipu Fei
1d104f367d Do not show not supported in profile manager 
CURA-4796
 2018-01-15 14:29:51 +01:00
Lipu Fei
4abbd4b988 Show custom qualities based on not supported 
CURA-4796
 2018-01-15 14:29:51 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +01:00
Ghostkeeper
73840f6bfc
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-15 13:57:48 +01:00
Ghostkeeper
e6cd6c2645
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:57:38 +01:00
Ghostkeeper
b4a06217df
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:55:35 +01:00
ChrisTerBeke
41dec889ac Also emit a back-end slicing error when the job result is an actual error 2018-01-15 11:52:15 +01:00
Diego Prado Gesto
67ca4d25cd CURA-4461 Deserialize materials with buildplates compatibility 2018-01-15 11:35:17 +01:00
Lipu Fei
dc596d0e1e Only remove selectable nodes in deleteAll() 
CURA-4795

Otherwise, after loading a project file, all nodes including the
machine will be removed and you don't see the machine any more.
 2018-01-15 11:12:09 +01:00
Lipu Fei
b60903afc2 Fix setting new ID in project loading 
CURA-4795
 2018-01-15 11:02:52 +01:00
Lipu Fei
20e7fe911f Only save models on the active build plate in 3MFWriter 
CURA-4792
 2018-01-15 10:49:38 +01:00
Lipu Fei
87dc3535bb Use isinstance() for SceneNode type check 
CURA-4525
 2018-01-15 09:59:41 +01:00
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00
ChrisTerBeke
6433619b2f Merge branch 'master' into feature_headless_docker 2018-01-15 09:30:47 +01:00
ChrisTerBeke
33da81d0d2 Check if scene has gcode_dict attribute before trying to get it 2018-01-15 09:18:57 +01:00
ChrisTerBeke
bd1bf2caaf Add use_gui flag in application, don't use theme functions when not using gui 2018-01-12 17:38:47 +01:00