Cura/resources
Jaime van Kessel bef410b4a3 Machines are now flattened before merging them
This ensures that machines are overwritten correctly

CURA-2108
2016-09-01 11:26:13 +02:00
..
definitions Adhesion settings now inherit from the correct stack 2016-08-29 13:30:46 +02:00
extruders Update start- & and gcode and change extruder names 2016-08-20 17:20:51 +02:00
i18n Update translation templates 2016-08-24 16:25:39 +02:00
images Change splash-screen so it does not say "developer version", pending a release "real soon now" 2016-04-05 22:28:52 +02:00
materials Machines are now flattened before merging them 2016-09-01 11:26:13 +02:00
meshes Update def.json and STL file 2016-08-17 16:38:22 -05:00
qml Single extrusion machines now show correct values for profiles in tab 2016-08-31 14:52:41 +02:00
quality Add UM2Ex+ profiles for Nylon, PC, CPE+ and TPU 2016-08-25 17:07:28 +02:00
shaders Tweak convex hull node and transparent object shader 2016-07-27 18:03:20 +02:00
themes/cura Tweak layout of Per Object Settings 2016-08-08 15:41:20 +02:00
variants Update variant profiles to use the right syntax for formulas 2016-05-26 15:32:08 +02:00