3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/resources/machines
History
Tim Kuipers a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura 
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
2016-04-11 18:50:41 +02:00
..
bq_hephestos.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
bq_hephestos_2.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
bq_hephestos_xl.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
bq_witbox.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
bq_witbox_2.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
dual_extrusion_printer.json Fix merge conflict resolution 2016-03-04 11:23:35 +01:00
fdmprinter.json Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura 2016-04-11 18:50:41 +02: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' 2016-04-04 18:49:09 +02: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.json Merge pull request #643 from guigashm/master 2016-02-26 10:55:10 +01:00
prusa_i3_xl.json Merge pull request #643 from guigashm/master 2016-02-26 10:55:10 +01:00
RigidBot.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
RigidBotBig.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
ultimaker.json Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files 2016-02-19 21:30:24 +01:00
ultimaker2.json Updated disallowed areas for um2 & um2+ 2016-04-04 14:13:18 +02:00
ultimaker2_extended.json Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:59:02 +02:00
ultimaker2_extended_plus.json Removed duplicate settings from machine profiles 2016-04-01 16:39:32 +02:00
ultimaker2_extended_plus_025.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2_extended_plus_040.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2_extended_plus_060.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2_extended_plus_080.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2_go.json Platform adhesion is now handled by inherit function 2016-03-10 15:09:15 +01:00
ultimaker2plus.json Added extra mm to UM2+ lower right disallowed area 2016-04-06 17:23:11 +02:00
ultimaker2plus_025.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2plus_040.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2plus_060.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker2plus_080.json JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
ultimaker_original.json Merge branch '2.1' 2016-04-04 18:49:09 +02:00
ultimaker_original_plus.json Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:23 +01:00