Commit graph

2687 commits

Author SHA1 Message Date
Jack Ha
c27219b1c4 Merge branch 'master' into recommended_sidebar 2016-11-30 12:36:46 +01:00
Ghostkeeper
db2ee920ce Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-11-30 11:09:56 +01:00
Tim Kuipers
b8ff7acb68 JSON fix: initial fan speed zero by default (CURA-3068) 2016-11-30 10:27:53 +01:00
Tim Kuipers
09e884fd92 JSON refactor: moved Initial Fan Speed out of the children of Fan Speed (CURA-3068)
we don't want it to inherit from Fan Speed, but children must always inherit from their parent.
2016-11-30 10:27:53 +01:00
Jaime van Kessel
477ffe12aa Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura 2016-11-30 09:13:05 +01:00
SAMSECTOR
edd76cd9ab Update printrbot_simple_extended.def.json 2016-11-30 10:27:31 +03:00
Tim Kuipers
e60f05c2fd JSON fix: limit_to_extruder for support_conical_enabled (CURA-2896) 2016-11-29 17:54:01 +01:00
Tim Kuipers
383eba9930 JSON refactor: multiple_mesh_overlap: Objects ==> Meshes (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
32a102a9e7 JSON refactor: move multiple_mesh_overlap to meshfixes category (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
50a61e56f7 JSON refactor: Dual Extrusion Overlap => Merged Objects Overlap (CURA-2444) 2016-11-29 17:50:01 +01:00
Jaime van Kessel
292d075a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 15:41:46 +01:00
Jaime van Kessel
06a9b69dc9 Merge branch 'feature_recursive_cubic' of github.com:Ultimaker/Cura 2016-11-29 15:16:25 +01:00
SAMSECTOR
1462054054 Update printrbot_simple_extended.def.json
Update
stl file renamed
2016-11-29 15:57:04 +03:00
SAMSECTOR
8fadc83f10 PrinterBot Simple Metal heated bed upgraded X&Z
PrinterBot Simple Metal heated bed upgraded X&Z
volume
x=250mm
y=150mm
z=235mm(due to handle conflict with z- axis)
Updates:
1-vertex budget minimized to 0.5MB
2- file renamed
2016-11-29 15:54:49 +03:00
SAMSECTOR
6d8bec59dc Delete Pbheatedbed.STL 2016-11-29 15:52:03 +03:00
SAMSECTOR
1261693ec9 Delete printrbot_simple_metal_platform_extend.STL 2016-11-29 15:27:43 +03:00
Ghostkeeper
7082ff7d68
Don't hide the dual extrusion category for single extrusion
The category gets hidden automatically if all of its child settings are disabled.
2016-11-29 13:11:27 +01:00
Ghostkeeper
aeedd47753 Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-11-29 12:46:24 +01:00
fieldOfView
68fd0814e5 Minor code-style-related fixes 2016-11-29 12:33:35 +01:00
SAMSECTOR
f3f038086c Add files via upload 2016-11-29 13:19:05 +03:00
SAMSECTOR
a44a4ef19d Update printrbot_simple_extended.def.json 2016-11-29 12:32:36 +03:00
Ghostkeeper
4b68f7141f Merge branch 'fix_toggle_filter_oopsies' of https://github.com/fieldOfView/Cura into fieldOfView-fix_toggle_filter_oopsies 2016-11-29 10:25:34 +01:00
SAMSECTOR
d30e5db91d Update printrbot_simple_extended.def.json 2016-11-29 10:23:06 +03:00
fieldOfView
b9280fef12 Allow setting build plate shape 2016-11-28 23:00:49 +01:00
Tim Kuipers
6b56d472e0 JSON fix: made retraction_combing not editable per mesh any more (CURA-1134)
Whether combing is no_skin now actually is retrieved globally
2016-11-28 18:00:27 +01:00
Ghostkeeper
5db5824377
Hide gradual infill when cubic subdivision infill pattern is selected
The setting has no effect then, so it doesn't matter what the value is while it's hidden either.

Contributes to issue CURA-2602.
2016-11-28 17:34:16 +01:00
Tim Kuipers
389bdd3c1b JSOn fix: use cubicsubdiv when determining the infill line distance (CURA-2602) 2016-11-28 15:05:22 +01:00
Ghostkeeper
f7380abafe
Merge branch 'IMADE3D-add_jellybox_printer' 2016-11-28 11:11:42 +01:00
Ghostkeeper
23adafc686 Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer 2016-11-28 11:11:06 +01:00
samirabaza
1b6a2dc579 PrinterBot Simple Metal heated bed upgraded X&Z
PrinterBot Simple Metal heated bed upgraded X&Z
volume
x=250mm
y=150mm
z=235mm(due to handle conflict with z- axis)
2016-11-28 11:38:17 +03:00
samirabaza
eeeb01da21 PrintrBot simple metal upgraded heated bed 250x150
PrintrBot simple metal upgraded heated bed 250x150
2016-11-28 11:35:58 +03:00
fieldOfView
9c604bb674 Fixes two minor issues introduced in the feature_find_settings merge 2016-11-26 22:46:21 +01:00
Tim Kuipers
84ca1f9cd7 JSON fix: make z_seam_pos settable per mesh (CURA-1461) 2016-11-25 16:44:09 +01:00
Tim Kuipers
2c1028e137 JSON feat: z seam position (CURA-1461) 2016-11-25 16:28:45 +01:00
Jaime van Kessel
a6ea4edfb4 Prime tower for UMODE won't block by default if using both extruders
CURA-3032
2016-11-25 11:51:43 +01:00
Ghostkeeper
dcb7e2abaf
Fix capitalisation of setting names
Saw a few inconsistencies.
2016-11-25 11:36:24 +01:00
Ghostkeeper
2835ae8b07
Improve defaults for pre-cooling
This is a profile update from the materials team. Micro-profile-update. This should make prints much better with high temperature materials such as CPE+.
2016-11-25 11:36:23 +01:00
Jaime van Kessel
6d66ea51ad Setting the support extruder in recommended mode now correctly updates them in custom
CURA-3033
2016-11-25 11:28:38 +01:00
Jaime van Kessel
510c988c43 Moved some setting functions back to definitions
CURA-3018
2016-11-25 09:39:19 +01:00
Tim Kuipers
2df6de1814 JSON fix: layer_start_x and y description update for better understanding (CURA-1112) 2016-11-24 17:28:34 +01:00
Tim Kuipers
de8e49b247 JSON language fix: start_layers_at_same_position is now Start Layers With The Same Part (CURA-1112) 2016-11-24 17:25:38 +01:00
Jack Ha
be2a802aa2 Changed ultimaker3 def so relations are retained. 2016-11-24 17:05:06 +01:00
jack
84759e5808 Merge pull request #1176 from Ultimaker/rework_file_handler
Rework file handler CURA-1263
2016-11-24 14:56:05 +01:00
Jaime van Kessel
f3d0ad2292 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-24 14:52:10 +01:00
Jaime van Kessel
9a81a24512 Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura 2016-11-24 14:47:02 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jack Ha
072d33ec68 Fixed profiles by removing double entries and changing math.round to round. 2016-11-24 12:58:33 +01:00
fieldOfView
d045738dc8 Simplify button width logic 2016-11-24 11:51:35 +01:00
Ghostkeeper
44f309226a
Make initial layer speed scale with normal speed
All profiles that set the print speed are edited as well to make sure that the initial layer speed is still the same.

Contributes to issue #1170.
2016-11-24 10:19:49 +01:00
fieldOfView
9dd8a88602 Fix review issues 2016-11-24 10:12:11 +01:00