Cura/resources/imade3d_jellybox/PLA
Filip Goc 13df255477 Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support
# Conflicts (resolved):
#	resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg
#	resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg
2019-07-17 02:19:45 +02:00
..
jbo_generic_pla_0.4_coarse.inst.cfg Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 2019-07-17 02:19:45 +02:00
jbo_generic_pla_0.4_fine.inst.cfg Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 2019-07-17 02:19:45 +02:00
jbo_generic_pla_0.4_medium.inst.cfg Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 2019-07-17 02:19:45 +02:00
jbo_generic_pla_0.4_ultrafine.inst.cfg Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support 2019-07-17 02:19:45 +02:00