Commit graph

6705 commits

Author SHA1 Message Date
fieldOfView
68fd0814e5 Minor code-style-related fixes 2016-11-29 12:33:35 +01:00
Ghostkeeper
d99fdb5c23
Merge branch 'vincentmarchetti-fix_x3dimport' 2016-11-29 11:37:43 +01:00
SAMSECTOR
f3f038086c Add files via upload 2016-11-29 13:19:05 +03:00
fieldOfView
86383b2be0 Get build plate shape options from the fdmprinter definition 2016-11-29 10:54:48 +01:00
Ghostkeeper
24c0b7c736 Merge branch 'fix_x3dimport' of https://github.com/vincentmarchetti/Cura into vincentmarchetti-fix_x3dimport 2016-11-29 10:50:36 +01:00
fieldOfView
ff0f63eb94 Document z fighting hack 2016-11-29 10:44:10 +01:00
fieldOfView
dc33d96e8c Make build plate shapes translatable 2016-11-29 10:42:24 +01:00
Ghostkeeper
c86d867adf
Merge branch 'fieldOfView-fix_toggle_filter_oopsies' 2016-11-29 10:35:29 +01: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
fieldOfView
4756168178 Fix elliptic bedshapes (vs circular)
MeshBuilder.addArc only supports circular arcs, not elliptic arcs. To work around this, the resulting MeshData is scaled.
2016-11-29 10:04:53 +01:00
Ghostkeeper
e4d3c7873b
Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 09:54:01 +01:00
Jack Ha
e43be1ba7e Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 09:06:31 +01:00
SAMSECTOR
d30e5db91d Update printrbot_simple_extended.def.json 2016-11-29 10:23:06 +03:00
fieldOfView
8651a9a902 Force update when changing origin 2016-11-29 00:17:56 +01:00
fieldOfView
31ca80d407 Create disallowed areas for polar printers 2016-11-28 23:00:53 +01:00
fieldOfView
70bc8d8889 Fix z-fighting 2016-11-28 23:00:52 +01:00
fieldOfView
2c5a4de264 Draw circular build plate for polar printers 2016-11-28 23:00:52 +01: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
Jack Ha
e888603dd5 Cura startup with setting errors now also results in Unable to slice. 2016-11-28 14:31:28 +01:00
Ghostkeeper
87587ffd40
Fix reloading meshes
Not tested with 3MF, but for normal cases this should hotfix it.
2016-11-28 14:11:44 +01:00
Ghostkeeper
a8547ed8be
Merge branch 'fieldOfView-feature_machine_settings_fixes' 2016-11-28 12:43:40 +01:00
Ghostkeeper
28c8dbec40 Merge branch 'feature_machine_settings_fixes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_machine_settings_fixes 2016-11-28 12:40:35 +01:00
Ghostkeeper
4fbbee52f3 Merge branch 'master' of https://github.com/cederom/Cura into cederom-master 2016-11-28 11:15:11 +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
Arjen Hiemstra
554a8a2e6a Remove stray __init__.py file from plugins dir
Since it completely breaks plugin loading as the plugin system thinks it
is a plugin it needs to load.

Fixes CURA-3041
2016-11-28 10:21:12 +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
CeDeROM
eced6852d5 Updated reference to an example machine profile.
Signed-off-by: CeDeROM <CeDeROM@tlen.pl>
2016-11-27 14:22:05 +01: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
484c7df5bc Added a bunch of thread yields
CURA-1263
2016-11-25 16:25:24 +01:00
Jaime van Kessel
ef7004fb72 User changes are deserialized by workspacereader if there is no machine conflict
CURA-1263
2016-11-25 16:17:46 +01:00
Jaime van Kessel
bde1e05273 Changing an instanceContainer now re-checks the error state of the stacks
CURA-2861
2016-11-25 14:54:32 +01:00
Jaime van Kessel
361aee3e3c Resolve value is now correctly displayed in profilesPage
CURA-2844
2016-11-25 13:29:46 +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
Jaime van Kessel
4e4f2f8cc5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-25 11:44:20 +01:00
Jaime van Kessel
7a4deb725a Clarified switching message
CURA-2898
2016-11-25 11:43:56 +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
ef4ad8d2ac Renamed um3networkprintingplugin to um3networkprinting
CURA-2862
2016-11-25 11:34:49 +01:00
Jaime van Kessel
3bdbb8d568 Merge branch 'UM3NPP_merge' of https://github.com/thopiekar/Cura 2016-11-25 11:31: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
Thomas Karl Pietrowski
37e57e587a Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge 2016-11-24 21:40:07 +01:00