Ghostkeeper c1385f5e4a Merge pull request #643 from guigashm/master ...

prusa i3 filament diameter to 1.75
Conflicts:
	resources/machines/prusa_i3_xl.json

2016-02-26 10:55:10 +01:00

..

bq_hephestos_2.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

bq_hephestos_xl.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

bq_hephestos.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

bq_witbox_2.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

bq_witbox.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

dual_extrusion_printer.json

JSON: fix: global_only not depending on print_sequence (CURA-923)

2016-02-23 13:24:39 +01:00

fdmprinter.json

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

2016-02-23 15:20:48 +01:00

grr_neo.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

m180.json

Match MIME types in printers with writer plugins

2016-02-09 17:16:38 +01:00

maker_starter.json

Match MIME types in printers with writer plugins

2016-02-09 17:16:38 +01:00

prusa_i3_xl.json

Merge pull request #643 from guigashm/master

2016-02-26 10:55:10 +01:00

prusa_i3.json

Merge pull request #643 from guigashm/master

2016-02-26 10:55:10 +01:00

RigidBot.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

RigidBotBig.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_extended_olsson_025.json

Add support for Ultimaker 2 Extended with Olsson Block upgrade

2016-02-19 20:39:32 +01:00

ultimaker2_extended_olsson_040.json

Add support for Ultimaker 2 Extended with Olsson Block upgrade

2016-02-19 20:39:32 +01:00

ultimaker2_extended_olsson_060.json

Add support for Ultimaker 2 Extended with Olsson Block upgrade

2016-02-19 20:39:32 +01:00

ultimaker2_extended_olsson_080.json

Add support for Ultimaker 2 Extended with Olsson Block upgrade

2016-02-19 20:39:32 +01:00

ultimaker2_extended_olsson.json

Add support for Ultimaker 2 Extended with Olsson Block upgrade

2016-02-19 20:39:32 +01:00

ultimaker2_extended_plus_025.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_extended_plus_040.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_extended_plus_060.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_extended_plus_080.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_extended_plus.json

Revert UM2+ machine names

2016-02-15 11:03:44 +01:00

ultimaker2_extended.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2_go.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker2_olsson_025.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2_olsson_040.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2_olsson_060.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2_olsson_080.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2_olsson.json

Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block

2016-02-19 20:39:32 +01:00

ultimaker2.json

Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files

2016-02-19 21:30:24 +01:00

ultimaker2plus_025.json

Remove variant setting overrides from machine settings

2016-02-22 14:20:35 +01:00

ultimaker2plus_040.json

Remove variant setting overrides from machine settings

2016-02-22 14:20:35 +01:00

ultimaker2plus_060.json

Remove variant setting overrides from machine settings

2016-02-22 14:20:35 +01:00

ultimaker2plus_080.json

Remove variant setting overrides from machine settings

2016-02-22 14:20:35 +01:00

ultimaker2plus.json

Remove override settings from UM2+ machine settings

2016-02-23 17:27:17 +01:00

ultimaker_original_plus.json

Move file types to machine metadata

2016-02-09 15:25:49 +01:00

ultimaker_original.json

Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files

2016-02-19 21:30:24 +01:00

ultimaker.json

Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files

2016-02-19 21:30:24 +01:00