3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 11:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
8609 commits 305 branches 270 tags 779 MiB
Commit graph

8609 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
bb0d534f4a Revert "Set machine_extruder_count in sync with defined extruders" 
This reverts commit b69f337ddb.
 2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336 Revert "Starting machineSettingAction no longer resets extruder count to 1" 
This reverts commit 452a6a095c.
 2017-05-08 15:30:39 +02:00
Jaime van Kessel
488752d4e3 Merge branch 'feature_add_alya3dp' of https://github.com/fieldOfView/Cura 2017-05-08 15:18:15 +02:00
Jaime van Kessel
bd25448021 Changes to make um2 upgrade work with new stack changes 
CURA-3742
 2017-05-08 15:03:39 +02:00
Jaime van Kessel
293f1ac029 Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura 2017-05-08 14:35:37 +02:00
Jaime van Kessel
452a6a095c Starting machineSettingAction no longer resets extruder count to 1 2017-05-08 14:25:13 +02:00
Jaime van Kessel
3f9a5fbcbb Changed logging so it doesn't look like it's printing lists 2017-05-08 14:22:36 +02:00
Jaime van Kessel
8efbbbb3f3 Merge pull request #1809 from fieldOfView/fix_multiextruder_machinesettings 
Fix multiextruder machinesettings
 2017-05-08 14:08:01 +02:00
fieldOfView
3fbdaf6c17 Ignore values of extruders that are inactive for the current machine instance 
extrudervalues() would include the values of extruders whose position >= machine_extruder_count. This can happen in machine definitions that have more extruders than machine_extruder_count, eg Custom FDM printer.
 2017-05-08 13:43:09 +02:00
jack
7dfa46d351 Merge pull request #1713 from Ultimaker/feature_CURA-3634_optional_priming 
CURA-3634: Make prime blob optional
 2017-05-08 13:38:13 +02:00
Ghostkeeper
6f383d4cc4
Make extruder_nr settable per extruder 
It is actually being set per extruder right now, since this is where the definition gets its extruder number from. If the setting is not settable per extruder, the ExtruderStack skips the setting entirely and defers to the global stack, which doesn't have the setting and so None is returned. This was giving errors.

Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
Ghostkeeper
a9813146c4
Evaluate global stack first 
The global stack has 99% of all settings. So most of the times the setting definition we are looking for is here. This should make it a bit faster to find.

Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
Ghostkeeper
281a01dd1f
Remove unused variable 
Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
Ghostkeeper
2137c30bd6
Also check extruders for definitions of error settings 
Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
MaukCC
570b8767e0 Update cartesio.def.json 2017-05-08 13:27:01 +02:00
Lipu Fei
48862ed2b2 Change to "prime_blob_enable" and update description 
CURA-3634
 2017-05-08 13:13:33 +02:00
fieldOfView
98b127851b Fix setting number of extruders when hasVariants is set 2017-05-08 12:54:12 +02:00
Lipu Fei
a3d92d557d GCodeProfileReader: make deserialization more robust 
CURA-3770
 2017-05-08 11:33:50 +02:00
Lipu Fei
3a5a28cc38 Use CuraStack.qualityChanges to get quality changes 
CURA-3770
 2017-05-08 11:33:50 +02:00
Jack Ha
4cf2394488 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 11:27:28 +02:00
Jack Ha
8680c6d79d Changed addExtruder exception to a warning to let Custom FDM Printer work again. Removed unused imports. CURA-3757 2017-05-08 11:27:19 +02:00
Ghostkeeper
e19d5411c2
Expand log message when getting no definition when listing error settings 
So that someone reading the log gets a clue where the error message occurs and why.

Contributes to issue CURA-3772.
 2017-05-08 11:17:37 +02:00
Jack Ha
82663a727f Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 10:51:29 +02:00
Jack Ha
1fe142ad1f Fix crashing Cura when switching multi extruder machine to single extruder machine while object selected. CURA-3776 2017-05-08 10:50:15 +02:00
Jaime van Kessel
8ba0ee126e Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 10:31:10 +02:00
Jaime van Kessel
63eceda75e Added handling for if definition for error handling was not found 
CURA-3772
 2017-05-08 10:28:31 +02:00
Lipu Fei
887a9d377a Use setting name "Prime Blob" 
CURA-3634
 2017-05-08 10:13:59 +02:00
Lipu Fei
a039f9552e Trigger extruderTabsCount update when MachineSettings dialog shows 
CURA-3755
 2017-05-08 09:47:42 +02:00
Ghostkeeper
b1596b7811
Merge branch 'rmcolbert-master' 2017-05-08 09:45:37 +02:00
Jaime van Kessel
b14dfadeb4 Merge pull request #1802 from Shaische/patch-1 
Update delta_go.def.json
 2017-05-08 09:41:12 +02:00
Ghostkeeper
6f0b81d046
Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master 2017-05-08 09:38:56 +02:00
Lipu Fei
319f5f73fe Rename "prime_enable" to "prime_poop_enable" 
CURA-3634
 2017-05-08 08:12:49 +02:00
Shaische
d0e4554b59 Update delta_go.def.json 2017-05-06 18:24:35 -04:00
Ghostkeeper
bd276a4d70
Convert Prusa i3 platform to binary STL 
Smaller file size, and apparently there were some syntax errors in the original ASCII STL file as far as numpy-stl was concerned.
 2017-05-05 14:56:45 +02:00
Ghostkeeper
c08eb043f0
Merge branch 'fix_float_number_line_width_um3' 2017-05-05 14:45:35 +02:00
Ghostkeeper
ce3b0d9fe4
Convert Kossel platform to binary STL 
There were reportedly some errors in the file format. I've opened it and re-saved it in CloudCompare to fix these. And I also converted it to binary STL to reduce the file size somewhat.
 2017-05-05 14:26:01 +02:00
Ghostkeeper
eb52e4fb7e
Ignore default name of ProfileFlattener too 
It already ignored FlatProfileExporter, but that's just a renamed version of what is now called ProfileFlattener.
 2017-05-04 17:57:55 +02:00
Ghostkeeper
81ea9556eb
Fix showing layer view if there is no material 
The layer view would request the colour of the material. If there is no material, that would give an error.

Contributes to issue CURA-3497.
 2017-05-04 17:56:57 +02:00
Jack Ha
7d787a2188 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-04 16:31:43 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
Lipu Fei
91b22edb06 Fix missing imports in CuraContainerRegistry 
CURA-3497
 2017-05-04 16:19:18 +02:00
Arjen Hiemstra
51b76acc6d Fix unit test 
CuraContainerRegistry::load now has a dependency on the ContainerStack
so we need to account for it in our mocks.
 2017-05-04 15:57:47 +02:00
Arjen Hiemstra
230740ed64 Fixup extruders that were converted from ContainerStack on load 
We need to make sure the extruder stacks get the proper next stack set,
even when converting them from ContainerStack. Since the conversion can
make no guarantees about the loading order, we need to add an extra step
to post-process the extruders.

Contributes to CURA-3497
 2017-05-04 15:44:16 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
0171d9637c Fix mode switching issue in LayerView 
CURA-3730
 2017-05-04 15:15:38 +02:00
Lipu Fei
f06562bc6e Remove kitten image and related text from CrashDialog 2017-05-04 14:33:19 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
Arjen Hiemstra
fe112d5d81 Fix extruderstack test on CI 
We do not need a complete CuraApplication just so registerExtruder
can work. Instead, we just mock away the extruder manager so the rest of
the test can proceed.
 2017-05-04 13:06:34 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00