Commit graph

311 commits

Author SHA1 Message Date
Tim Kuipers
7edb9ab3a0 JSON: introduce basic Olsson nozzle stats (CURA-1281) 2016-03-24 13:54:17 +01:00
Tim Kuipers
1f4763fca2 JSON: edit machine height based on longer olsson nozzle (CURA-1281) 2016-03-24 13:53:22 +01:00
Tim Kuipers
2e7d370497 JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
Tim Kuipers
978cf3e824 JSON fix: removed inherit cause it already had an inherit_function (CURA-1195) 2016-03-23 18:19:50 +01:00
Tim Kuipers
f7c842dabe JSON fix: default retraction amount on UM2+ is 6mm (CURA-1195) 2016-03-23 14:02:10 +01:00
Tim Kuipers
5037fab1b3 JSON: fixed defaults which should hold for all machines (CURA-1195) 2016-03-23 13:26:51 +01:00
Tim Kuipers
8eb4007334 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:40:56 +01:00
Tim Kuipers
feb1ed4c2e JSON fix: handle fuzzy skin min/max (CURA-1225) 2016-03-23 12:40:46 +01:00
Ghostkeeper
be57fa03d2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:14:53 +01:00
Ghostkeeper
71721811f5
Rename Shell Speed to Wall Speed
It only applies to the walls, not the skin, after all.

Contributes to issue CURA-1183.
2016-03-23 12:14:16 +01:00
Jaime van Kessel
5b04787106 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:04:19 +01:00
Jaime van Kessel
db628760d8 Comment in start g-code for umo now has correct value 2016-03-23 12:04:08 +01:00
fieldOfView
fd29baccd4 Fix backplate texture of UM2Ex with Olsson block
CURA-1239
2016-03-22 22:53:15 +01:00
Ghostkeeper
4725b1b074
Rename 'Other Wall' to 'Inner Wall'
This is both more correct and more consistent with the descriptions.

Contributes to issue CURA-1212.
2016-03-22 18:00:46 +01:00
Tim Kuipers
ec06226907 quickfix for fan full at height 2016-03-21 14:16:37 +01:00
Jaime van Kessel
235f324d56 Added missing enabled parameters 2016-03-21 11:12:00 +01:00
Jaime van Kessel
bb220ed952 Removing min warning from support_tower_diameter
The min warning caused an infinite recursion when support was
enabled / disabled

CURA-1156
2016-03-18 15:52:56 +01:00
Jaime van Kessel
834e2148d2 Major cleanup for profiles
This removes a bunch of settings that override default values from machine defaults (or inheritance)
2016-03-18 14:18:19 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1'
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
2016-03-17 15:24:00 +01:00
Tim Kuipers
b7065628a3 JSON: temporarily made temp graph and cooldown speed modifier disabled (CURA-1157) 2016-03-16 09:55:19 +01:00
Tim Kuipers
802623443a JSON: fix for inherit function of fan speed (CURA-1171) 2016-03-15 17:51:52 +01:00
Tim Kuipers
65499bd06c JSON: made parent-child relations logical (CURA-1171)
the child should depend foremost on the parent
no parent may be used in the engine
2016-03-15 17:48:58 +01:00
Jaime van Kessel
0bf41cf528 Changed dimensions of UM2
CURA-1166
2016-03-15 16:48:35 +01:00
Tim Kuipers
75b43de546 JSON: wall thickness warning values based on line_width instead of harccoded (CURA-1167) 2016-03-15 15:27:19 +01:00
Tim Kuipers
a20e98d980 JSON: minimal support width only holds for conical supprot (CURA-1164) 2016-03-15 15:16:45 +01:00
Tim Kuipers
90b0692f78 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 13:01:38 +01:00
Tim Kuipers
5998371644 JSON: made support_bottom_distance disabled and default to zero when Placement=Buildplate Only (CURA-1161) 2016-03-15 12:59:03 +01:00
Tim Kuipers
34814cd657 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 11:10:20 +01:00
Tim Kuipers
69997587e9 JSON: introduced Outer Wall Inset (CURA-1098) 2016-03-15 10:00:41 +01:00
Tim Kuipers
d668438d1f JSON: merge fix: support_minimal-diameter was double.. 2016-03-14 13:57:13 +01:00
Tim Kuipers
b96f3d7733 JSON: make top_bottom_thickness available after all (CURA-1099) 2016-03-14 12:02:54 +01:00
Jaime van Kessel
a3eb212d68 Platform adhesion is now handled by inherit function
Based on suggestion by ghostkeeper CURA-1068
2016-03-10 15:09:15 +01:00
Jaime van Kessel
9f29af82b5 Fixed issues caused by 3b6aedd585 2016-03-10 14:07:03 +01:00
Tim Kuipers
3b6aedd585 JSON: disabled top_bottom_thickness, shell_thickness and remove_overlapping_wall_parts_0_enabled (CURA-1099) 2016-03-10 12:43:07 +01:00
Jaime van Kessel
9731d189be UM2Go and UMO now have brim as default platform adhesion
CURA-1068
2016-03-09 14:53:10 +01:00
Ghostkeeper
a785c9a205
Fix merge conflict resolution
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585 JSOn/profiles: changed infill overlap to mm (CURA-786) 2016-03-03 17:28:45 +01:00
fieldOfView
2c2640f38b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:18:02 +01:00
fieldOfView
2f9d505fdc Fix and move Innovo INVENTOR machine definition to machines folder 2016-03-03 17:17:36 +01:00
Tim Kuipers
b0befb6309 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:11:12 +01:00
Tim Kuipers
ff1cf02470 JSON: fix: magic surface mode had wrong default 2016-03-03 17:10:59 +01:00
fieldOfView
6d1a848e40 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 16:44:49 +01:00
fieldOfView
dfef811821 Update UM2+, UM2Ex and UM2Ex+ backplates 2016-03-03 16:19:24 +01:00
Tim Kuipers
884de2a8ce JSON: fix: min_value should be a string also for third party printers :P 2016-03-03 13:09:28 +01:00
Tim Kuipers
b4b2267890 JSON: fix: rigidbot printers had duplicate id 2016-03-03 12:29:39 +01:00
Tim Kuipers
35fce68797 JSON: less warnings foor max retraction count (CURA-998) 2016-03-02 18:23:59 +01:00
Tim Kuipers
645139fcc8 JSON: made support default to false (CURA-983) 2016-03-02 17:14:06 +01:00
Tim Kuipers
411b8b0502 profiles: removed brim_line_count and let brim_width just use the default 8mm (CURA-983) 2016-03-02 17:13:04 +01:00
Tim Kuipers
0d142a03d0 JSON: changed support placement from buildplate to eveerywhere (CURA-983) 2016-03-02 17:11:32 +01:00