larsbrubaker
7266220b35
Put in gcode as valid file
2014-10-14 17:59:46 -07:00
Kevin Pope
526873ac5f
Added some initial multi-material preset support. Slice mapping pulls correct temp based on preset.
2014-10-14 17:10:22 -07:00
Kevin Pope
70f807032c
Get temperature value based upon extruder index.
2014-10-14 16:23:41 -07:00
Kevin Pope
db1da694b9
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-14 14:40:03 -07:00
Kevin Pope
9e9259bfba
Adding mutli-material UI support.
2014-10-14 14:39:46 -07:00
larsbrubaker
5670812d54
Merge remote-tracking branch 'Greg/development' into development
2014-10-14 14:38:32 -07:00
larsbrubaker
941c06555b
Made the multi object stls generate better thumbnails.
...
Better progress indication.
Fixed bugs in ungrouping amfs
2014-10-14 14:38:17 -07:00
gregory-diaz
0bb27e1fe5
Merge remote-tracking branch 'upstream/development' into development
2014-10-14 14:04:26 -07:00
gregory-diaz
57c5e15917
Added restart button and functionality to Change Display Options widget
2014-10-14 14:03:27 -07:00
larsbrubaker
cb145fa6c1
Merge remote-tracking branch 'Greg/development' into development
2014-10-14 11:23:34 -07:00
larsbrubaker
92758491a7
show save buttons when material changes not when selection changes
2014-10-14 11:15:42 -07:00
gregory-diaz
b5484bb922
Added serial port radio buttons to scrollable widgets(did not implement right the first time)
2014-10-14 10:03:21 -07:00
gregory-diaz
a2dbd3a891
resolved conflicts to merge
2014-10-14 09:35:22 -07:00
gregory-diaz
babd2cc620
Added serial port radio buttons to scrollable widget.
2014-10-14 09:33:14 -07:00
gregory-diaz
70e4dd7a54
Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development
2014-10-14 09:18:07 -07:00
Kevin Pope
eed4306c1f
Adjusted library items.
2014-10-13 19:29:25 -07:00
Kevin Pope
e8f8cf24ad
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-13 18:47:41 -07:00
Kevin Pope
4d9f5ce9f6
Alignment corrections.
2014-10-13 18:47:27 -07:00
larsbrubaker
22686a8924
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-13 18:20:39 -07:00
larsbrubaker
20c60380c7
Make sure we remember what material a mesh is using when we copy it.
2014-10-13 18:20:01 -07:00
Kevin Pope
e4a526b2aa
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-13 18:06:49 -07:00
Kevin Pope
e17ea72299
Added UI support for manual extrusion with multiple extruders.
2014-10-13 18:06:14 -07:00
larsbrubaker
2ee0f7a111
Put in an ExtrudersShareTemperature setting
...
Getting the gcode output to put in extruder 2 temps.
2014-10-13 17:00:25 -07:00
larsbrubaker
522d0f4a5f
Putting in location where the n extruder heat setting will go.
2014-10-13 16:32:54 -07:00
larsbrubaker
3ab502917e
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-13 15:58:48 -07:00
larsbrubaker
1f5bd3fcad
Save 'save as' meshes as amf.
2014-10-13 15:58:06 -07:00
Kevin Pope
8deb23f3f6
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-13 15:26:03 -07:00
Kevin Pope
a03aee76f3
Adjusted touchscreen layout reload behavior.
2014-10-13 15:25:27 -07:00
larsbrubaker
c4f62e21f8
We now send the right info to MatterSlice when printing a multi material part.
2014-10-13 14:40:26 -07:00
larsbrubaker
ba9834fec6
Did not mean to check in the conflict.
2014-10-13 12:28:59 -07:00
larsbrubaker
196c3e1c76
Merge remote-tracking branch 'Greg/development' into development
...
Conflicts:
PartPreviewWindow/View3DTransfromPart.cs
2014-10-13 12:27:31 -07:00
gregory-diaz
ea64797729
More Localizations
2014-10-13 12:07:09 -07:00
gregory-diaz
80b13cf302
Localization of untranslated strings
2014-10-13 12:07:07 -07:00
gregory-diaz
4ce60a6865
Added Export button to PartPreviewWindow with functionality.
2014-10-13 12:07:04 -07:00
larsbrubaker
66b5844c99
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
StaticData/Translations/Master.txt
2014-10-13 10:58:48 -07:00
larsbrubaker
005898ce36
Merge remote-tracking branch 'Greg/development' into development
...
Conflicts:
StaticData/Translations/Master.txt
2014-10-13 10:57:44 -07:00
larsbrubaker
c7915b30b9
Saving as stl (amf broken)
...
Better labels on progress.
2014-10-12 20:47:54 -07:00
larsbrubaker
3f7c300d2a
Make sure we don't try to create thumbnails for things we can't.
2014-10-12 20:40:38 -07:00
larsbrubaker
426742ebf2
Got auto arrange working with groups
2014-10-12 18:49:46 -07:00
larsbrubaker
c0d2e88c7b
Making some unfinished code compile.
2014-10-12 08:22:17 -07:00
larsbrubaker
69825d48dc
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-12 08:18:34 -07:00
larsbrubaker
d3cd9a25f9
Making ungroup work on meshes (this is what used to happen when entering edit).
...
New CreateDiscreteMeshes that works on attached mesh volumes rather than an orthographic projection.
Put in a "Selection" menu for 3D editing that lets one group and ungroup and assign materials.
2014-10-12 08:18:24 -07:00
Kevin Pope
992c8a2430
Made file saves async compatible.
2014-10-11 15:11:26 -07:00
Kevin Pope
fbe1333cf0
Change file open functionality to async compatible.
2014-10-11 14:48:10 -07:00
Kevin Pope
b3139fe4ee
Adjust size of disable-able widget
2014-10-11 14:47:39 -07:00
larsbrubaker
b90177e4e0
Fixed the 3d gcode view stopping correct rendering.
...
Removed MatterRepair from project
Renaming
2014-10-11 08:13:26 -07:00
gregory-diaz
35ed4899d0
More Localizations
2014-10-10 15:55:57 -07:00
gregory-diaz
5ab69b0b73
Localization of untranslated strings
2014-10-10 15:52:33 -07:00
gregory-diaz
f6e5929e5b
Added Export button to PartPreviewWindow with functionality.
2014-10-10 14:52:50 -07:00
gregory-diaz
b3589d6c8c
Added functional Gcode terminal on configuration page.
2014-10-10 12:50:59 -07:00
