larsbrubaker
374edca7ce
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
SlicerConfiguration/SlicingQueue.cs
StaticData/Translations/Master.txt
2014-10-19 20:15:12 -07:00
larsbrubaker
307ddca93d
Made exporting to a single extruder put in all the meshes.
...
Put in support extrusion width.
2014-10-19 20:10:02 -07:00
larsbrubaker
83788f8d85
Read waiting for print bed to heat on smoothie
2014-10-18 15:50:03 -07:00
larsbrubaker
df686386e2
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
ApplicationView/CompactTabView.cs
Made a new Draw EventHandler for GuiWidget
Made mesh viewer have colors per material
Made the screen reload on change printer
Made the select material a radio button, much easier to use.
2014-10-18 13:23:53 -07:00
larsbrubaker
38e55eefbb
Working on material color setting
2014-10-18 10:26:36 -07:00
Kevin Pope
6646db683f
Spelling correction.
2014-10-17 19:17:10 -07:00
larsbrubaker
cbe97d4513
Merge remote-tracking branch 'Greg/development' into development
2014-10-17 18:46:25 -07:00
larsbrubaker
c28e6daaae
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-17 18:45:38 -07:00
larsbrubaker
c78bf7a05c
Made export do conversion when required.
2014-10-17 18:45:15 -07:00
gregory-diaz
d2bf2ece85
Merge remote-tracking branch 'upstream/development' into development
2014-10-17 15:39:29 -07:00
gregory-diaz
4b03d09e3c
Fixed QueueOptions menu
2014-10-17 15:33:01 -07:00
Kevin Pope
01cf3003f3
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-17 14:12:09 -07:00
Kevin Pope
6c1a8005bb
Made contact form respect universal text size. Made action bar and menu bar hide-able (in compact mode).
2014-10-17 14:11:56 -07:00
larsbrubaker
8237fb5e98
Made the default sliders have some size.
2014-10-17 12:14:06 -07:00
larsbrubaker
0854701777
Made text creator save as stl and do csg merge
2014-10-17 11:04:36 -07:00
larsbrubaker
55923d8f2a
Fixed the text creator to work with new MeshGroups code for AMF.
...
Move more stuff from View3DWidget into separate files.
Renamed View3DWidget.
2014-10-16 17:52:21 -07:00
larsbrubaker
f9d4d526e6
Now align works.
2014-10-16 12:58:51 -07:00
Kevin Pope
b7770b9008
Added sub header to temperature controls.
2014-10-16 12:31:20 -07:00
Kevin Pope
e767a3408f
Made disable-able widget responsive to text-size.
2014-10-16 12:30:57 -07:00
larsbrubaker
6590583d19
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
...
Conflicts:
PrinterControls/ManualPrinterControls.cs
2014-10-15 17:11:20 -07:00
larsbrubaker
398023ba7b
Put in actual extruder temp setting and reading for multi extruders.
...
Got rid of crash when no gcode loaded and try to clear it.
2014-10-15 17:04:14 -07:00
Kevin Pope
7af54a9a20
Merge commit ' edcce1e360' into development
...
Conflicts:
StaticData/Translations/Master.txt
2014-10-15 16:58:19 -07:00
Kevin Pope
9faee063eb
Refactoring manual controls widget.
2014-10-15 16:57:26 -07:00
larsbrubaker
edcce1e360
Moving PartPreview3DWindow into partial class with the processors being partial adds so it is easier to navigate the code.
...
Can export from amf
Starting work on align
2014-10-15 14:11:14 -07:00
larsbrubaker
098b203153
Making the progress bars much better.
2014-10-15 10:50:22 -07:00
larsbrubaker
242bac2b1a
Get the transform from the right array.
2014-10-15 08:01:48 -07:00
larsbrubaker
fabbbc4472
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-15 07:44:59 -07:00
larsbrubaker
c2e7ce949c
Put the sort vertices into mesh
2014-10-15 07:44:50 -07:00
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
