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
..
bundled_packages	Fix merge issue	2019-04-26 11:53:50 +02:00
definitions	Update JellyBOX start gcodes	2019-07-17 01:48:58 +02:00
extruders	Add JellyBOX 2 Extruder	2019-07-17 01:42:45 +02:00
i18n	Update translation templates per language for Cura 4.2	2019-07-16 14:50:50 +02:00
imade3d_jellybox	Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support	2019-07-17 02:19:45 +02:00
imade3d_jellybox_2	Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support	2019-07-17 02:19:45 +02:00
images	add START and STE320 profiles	2019-04-25 15:42:59 +04:00
meshes	Add JellyBOX 2 platform	2019-07-17 01:42:58 +02:00
qml	Specify both Ultimaker B.V. and Custom as preferred categories	2019-07-11 09:58:40 +02:00
quality	Merge branch 'master-2019-12-17' into update_imade3d_jellybox_support	2019-07-17 02:19:45 +02:00
setting_visibility	Remove the max-z-speed-override	2019-07-03 16:13:21 +02:00
shaders	Make stripes closer togheter in striped shader.	2019-07-02 16:49:27 +02:00
texts	Some minor fixes to change log	2019-05-28 09:42:07 +02:00
themes	Merge branch 'master' of github.com:Ultimaker/Cura	2019-06-11 09:54:14 +02:00
variants	Update the JellyBOX variants	2019-07-17 01:48:40 +02:00