3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 19:01:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/resources/definitions
History
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
..
bq_hephestos.def.json JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
bq_hephestos_2.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
bq_hephestos_xl.def.json JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
bq_witbox.def.json JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
bq_witbox_2.def.json JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
custom.def.json Fix preferred material for cases when there more than 1 "pla" materials 2016-08-22 17:12:39 +02:00
fdmextruder.def.json JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
fdmprinter.def.json Merge branch '2.3' 2016-10-20 12:41:31 +02:00
grr_neo.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
innovo_inventor.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
kossel_mini.def.json Add Kossel Mini printer definition 2016-09-16 15:51:21 -03:00
m180.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
maker_starter.def.json JSON bugfix: prusa i3 had wrong adhesion setting (CURA-2410) 2016-10-03 14:42:14 +02:00
mankati_fullscale_xt_plus.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
mendel90.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
printrbot_simple.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
prusa_i3.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
prusa_i3_mk2.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
prusa_i3_xl.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
rigidbot.def.json JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410) 2016-10-03 14:41:09 +02:00
rigidbot_big.def.json JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410) 2016-10-03 14:41:09 +02:00
ultimaker.def.json Min & max values for extruder prime pos are now enforced for Ultimaker machines 2016-09-27 16:12:02 +02:00
ultimaker2.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker2_extended.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker2_extended_plus.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker2_go.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker2_plus.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker3.def.json Publish Ultimaker 3 definitions and profiles 2016-10-19 13:35:00 +02:00
ultimaker3_extended.def.json Publish Ultimaker 3 definitions and profiles 2016-10-19 13:35:00 +02:00
ultimaker_original.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker_original_dual.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
ultimaker_original_plus.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00
uniqbot_one.def.json JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360) 2016-09-13 16:44:55 +02:00