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

..

bq_hephestos_2.json

JSOn/profiles: changed infill overlap to mm (CURA-786)

2016-03-03 17:28:45 +01:00

bq_hephestos_xl.json

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

2016-02-12 09:46:23 +01:00

bq_hephestos.json

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

2016-02-12 09:46:23 +01:00

bq_witbox_2.json

JSOn/profiles: changed infill overlap to mm (CURA-786)

2016-03-03 17:28:45 +01:00

bq_witbox.json

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

2016-02-12 09:46:23 +01:00

dual_extrusion_printer.json

Fix merge conflict resolution

2016-03-04 11:23:35 +01:00

fdmprinter.json

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

2016-03-04 10:59:40 +01:00

grr_neo.json

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

2016-02-12 09:46:23 +01:00

innovo-inventor.json

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

2016-03-04 10:59:40 +01:00

m180.json

Match MIME types in printers with writer plugins

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

maker_starter.json

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

2016-02-12 09:46:23 +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

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

2016-03-04 10:59:40 +01:00

RigidBotBig.json

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

2016-03-04 10:59:40 +01:00

ultimaker2_extended_olsson_025.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_extended_olsson_040.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_extended_olsson_060.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_extended_olsson_080.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_extended_olsson.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_extended_plus_025.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2_extended_plus_040.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2_extended_plus_060.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2_extended_plus_080.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2_extended_plus.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +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

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

2016-02-12 09:46:23 +01:00

ultimaker2_olsson_025.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_olsson_040.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_olsson_060.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_olsson_080.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +01:00

ultimaker2_olsson.json

Fix saving Gcode for UM2 with Olsson printers

2016-03-01 18:08:06 +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

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2plus_040.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2plus_060.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2plus_080.json

Update UM2+, UM2Ex and UM2Ex+ backplates

2016-03-03 16:19:24 +01:00

ultimaker2plus.json

JSOn/profiles: changed infill overlap to mm (CURA-786)

2016-03-03 17:28:45 +01:00

ultimaker_original_plus.json

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

2016-02-12 09:46:23 +01:00

ultimaker_original.json

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

2016-03-04 10:59:40 +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