3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch '2.1'

Browse source 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-04-04 18:49:09 +02:00
commit 0684cee681
86 changed files with 2336 additions and 3490 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/machines/RigidBot.json
View file

@ -37,7 +37,6 @@
"overrides": {
"layer_height": { "default": 0.2 },
"shell_thickness": { "default": 0.8 },
"wall_thickness": { "default": 0.8 },
"top_bottom_thickness": { "default": 0.3, "visible": true },
"material_print_temperature": { "default": 195, "visible": true },