3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8454 commits 348 branches 300 tags 769 MiB
Commit graph

3602 commits

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
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
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
Lipu Fei
48862ed2b2 Change to "prime_blob_enable" and update description 
CURA-3634
 2017-05-08 13:13:33 +02:00
Lipu Fei
887a9d377a Use setting name "Prime Blob" 
CURA-3634
 2017-05-08 10:13:59 +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
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme" 
This reverts commit a1f32b74e5. The fix was correct but we allow the honour for Randyxxl.
 2017-05-04 12:53:05 +02:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme 
Otherwise it stays white.
 2017-05-04 09:48:54 +02:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack' 
Contributes to issue CURA-3497.
 2017-05-03 17:11:55 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders 
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
 2017-05-03 17:01:08 +02:00
Ghostkeeper
1778751397
Fix travel speed override 
Was a typo by the contributor of this definition.
 2017-05-03 15:39:20 +02:00
Randall Wessel
687d326fae Changed color to transparancy and spaces instead of tabs 2017-05-03 15:34:56 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack 2017-05-03 15:21:01 +02:00
Randall Wessel
163543b86b Make background color of toggle button themeable 
Background of toggle button gets same color as toolbar surrounding the
button.
 2017-05-03 14:26:44 +02:00
Jaime van Kessel
5159894d5b Merge pull request #1780 from LipuFei/fix_jobspec_tofix 
Fix TypeError in JobSpec.qml due to material cost being undefined
 2017-05-03 14:12:03 +02:00
Jack Ha
a5033bae54 Enable Support settings that are applicable to support meshes. CURA-2747 2017-05-03 13:40:33 +02:00
Lipu Fei
ac560229a1 Fix TypeError in JobSpec.qml due to material cost being undefined 2017-05-03 10:45:39 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size 
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
 2017-05-02 13:39:12 +02:00
Tim Kuipers
c69000da75 Merge branch 'feature_support_stair_width' 2017-05-02 13:22:19 +02:00
Ghostkeeper
7a9a4ae290
Revert "Change Label to Text because of ugle font rendering" 
This reverts commit 8c9eccd1f4. This element is in a modal window, where the fonts should get the system themeing.
 2017-05-02 12:58:29 +02:00
Mark
0e1748b705 Small layout fix so the comboboxes are aligned 2017-05-02 12:55:37 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control 
While simplifying theme additions
 2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block 
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
 2017-04-30 12:38:46 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer 
See https://github.com/Ultimaker/Cura/issues/1759
 2017-04-30 10:53:23 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons 
Add Extruder selection buttons to the Toolbar
 2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker 
Theme picker
 2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button 
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
 2017-04-26 16:17:54 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label 
CURA-3609
 2017-04-26 13:01:14 +02:00