3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
5414 commits 306 branches 272 tags 787 MiB
Commit graph

399 commits

Author SHA1 Message Date
Tim Kuipers
ed1670caef connected extruder trains to punchtec connect xl 2016-11-14 11:37:01 +01:00
Tim Kuipers
11f6494baf capitalized Punchtech Connect XL 2016-11-14 11:35:37 +01:00
Tim Kuipers
52ab376616 removed duplicate Pruse i3 2016-11-14 11:34:49 +01:00
Tim Kuipers
6f3b8a7fa1 renamed ORD to RoVa3D 2016-11-14 10:30:59 +01:00
Tim Kuipers
fb92e50262 JSON fix: fixed all start/end gcode references to settings and non-existent variables 2016-11-11 16:28:43 +01:00
Tim Kuipers
98bbeae055 lil: rounding error 2016-11-10 13:47:09 +01:00
Tim Kuipers
b86d8b4815 removed default setting 2016-11-10 13:47:09 +01:00
Tim Kuipers
967e5c5776 fix: makerbot output file format: x3g 2016-11-10 13:47:09 +01:00
Tim Kuipers
bba74328f1 fix: Deltabot manufacturer 2016-11-10 13:47:09 +01:00
fieldOfView
0597610388 Add known manufacturers, make capitalization consistent 2016-10-22 15:37:28 +02:00
Tim Kuipers
e1409c4f83 julia machine definition 2016-10-22 12:15:29 +02:00
Tim Kuipers
48b5632fdc all machines from legacy Cura 2016-10-22 01:10:42 +02:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f.

reapplies 8ee22738bc
 2016-10-21 16:21:08 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Ghostkeeper
aa9516451d Merge branch '2.3.1' into 2.3 2016-10-20 11:04:28 +02:00
Tim Kuipers
fd50d9e316 JSON fix: added comment in cool_min_layer_time description about Minimum Speed (CURA-2720) 2016-10-19 14:44:58 +02:00
Ghostkeeper
06ff2a9da6
Publish Ultimaker 3 definitions and profiles 
The Ultimaker 3 is now released, so we can make this data public. These are the Ultimaker 3 definition files (with their physical properties as Cura requires them, such as build volume) as well as its extruders, print cores, quality profiles and build plate mesh. And also for the Ultimaker 3 Extended. Modifications to the material profiles will be published in the fdm_materials repository.

Contributes to issue CURA-2737.
 2016-10-19 13:35:00 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812 JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727) 2016-10-19 13:05:10 +02:00
Tim Kuipers
aad3da85e9 JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727) 2016-10-19 12:59:28 +02:00
Simon Edwards
9e6f340943 Move z hop settings to Travel category 
CURA-2727
 2016-10-18 15:49:03 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
nickthetait
1bc2f1e189 More formatting updates 2016-10-13 08:11:15 -06:00
nickthetait
bf331f39af Merge branch 'um-master' into gh-issue-980 
Conflicts:
	resources/definitions/fdmprinter.def.json
 2016-10-13 08:01:00 -06:00
Ghostkeeper
ce6e3982fe
Make resolve function of bed temperature use max 
We want the bed to have the highest temperature of the two. This causes some melting for softer materials, but it is required for harder materials to stick to the build plate.
 2016-10-13 13:15:16 +02:00
Ghostkeeper
0a39802cb2
Fix resolve function of support_type 
It was not quoted, so it interpreted it as a variable.
 2016-10-12 16:09:15 +02:00
Arjen Hiemstra
50390dae03 Replace all instances of "layer_height" in functions with resolveOrValue 
Since we have layer_height in quality profiles (and cannot remove it) we
need to handle this. It turns out using resolveOrValue is a quick fix.

Fixes CURA-2604
 2016-10-11 16:03:57 +02:00
Tim Kuipers
63afe917e5 JSON fix: combing mode has link icon now (CURA-2568) 2016-10-11 14:08:10 +02:00
Ghostkeeper
62d6b1fcdd
Adjust max warning for coasting volume 
It now depends on the machine nozzle size.

Contributes to issue CURA-905.
 2016-10-06 16:06:14 +02:00
Tim Kuipers
aaaf1dfc58 JSOn fix: cap extruder switch retraction speed to machine_max_feedrate_e (CURA-905) 
just like the normal retraction speeds.
 2016-10-06 15:08:17 +02:00
Tim Kuipers
7e8ce98f48 JSON fix: typo (CURA-905) 2016-10-06 12:15:57 +02:00
Tim Kuipers
e63b572417 JSON fix: fixed raft warnings flawed logic (CURA-905) 
For layer_0_z_overlap we are only sure to overextrude when the overlap is more than the airgap.

Layer height warnings are now based on line widths for raft, because the line widths are way larger than the nozzle size.
 2016-10-06 12:13:47 +02:00
Tim Kuipers
edd06f860a JSON fix: retractions speed warnings and raft margin warning based on likely possible testing values (CURA-905) 2016-10-06 12:11:40 +02:00
Jaime van Kessel
e4c6b58611 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 14:08:10 +02:00
Tim Kuipers
93186dedd0 JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +02:00
Jaime van Kessel
2e9fa7ece1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:04:06 +02:00
Ghostkeeper
3b6d8f40aa
Also hide support interface line width if support is disabled 
Also, the extruderValue call is superfluous since the setting is already limited to this extruder.
 2016-10-04 11:00:29 +02:00
Tim Kuipers
6240baaaca JSON fix: better warning formulas (CURA-905) 2016-10-03 17:56:03 +02:00
Tim Kuipers
9b342a9a3e JSON fix: removed circular dependency (CURA-905) 2016-10-03 17:35:28 +02:00
Tim Kuipers
2513c64d7d JSON fix: more feasible warnings (CURA-905) 2016-10-03 17:29:25 +02:00
Tim Kuipers
4e4171fc53 JSON fix: resolveOrValue for support_type (CURA-2410) 2016-10-03 14:52:33 +02:00
Tim Kuipers
4c46985c75 JSON fix: resolveOrValue for retraction_combing (CURA-2410) 2016-10-03 14:51:28 +02:00
Tim Kuipers
91bed05d63 JSON fix: resolveOrValue for prime_tower_size (CURA-2410) 2016-10-03 14:50:20 +02:00
Tim Kuipers
dee434b958 JSON fix: resolveOrValue for ooze_shield_enalbed (CURA-2410) 2016-10-03 14:49:01 +02:00
Tim Kuipers
c7fbaa9fb8 JSON fix: resolveOrValue for layer_height_0 (CURA-2410) 2016-10-03 14:46:36 +02:00
Tim Kuipers
8696d2ff34 JSON fix: resolveOrValue for jerk_enabled (CURA-2410) 2016-10-03 14:44:14 +02:00
Tim Kuipers
6564ada60d JSON bugfix: prusa i3 had wrong adhesion setting (CURA-2410) 2016-10-03 14:42:14 +02:00
Tim Kuipers
16a07a3c3e JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410) 2016-10-03 14:41:09 +02:00