nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1125 commits 1 branch 0 tags 103 MiB
Commit graph

143 commits

Author SHA1 Message Date
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
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
242bac2b1a Get the transform from the right array. 2014-10-15 08:01:48 -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
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
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
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
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
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
gregory-diaz
cfd94ecf27 Localization for untranslated strings 2014-10-09 14:33:55 -07:00
larsbrubaker
2d3d26a68d Working to get the collision stuff working with mesh groups 
Put in the RomotingLite project to start on TigerSong
 2014-10-09 11:29:33 -07:00
kevinepope
53551add48 More work on Library. Edit mode now contains export and edit functions (during single selection). 2014-10-05 18:12:37 -07:00
larsbrubaker
02b520dac3 Merge branch '1.1.3' into development 
Conflicts:
	ConfigurationPage/LanguageSelector.cs
 2014-10-02 15:31:47 -07:00
Kevin Pope
c040b06b7c Added polish translation. 2014-09-29 19:17:05 -07:00
larsbrubaker
1b767a6abc Moved Localizations into agg 
working to add ability to compile to 64 bit.
 2014-09-26 12:33:16 -07:00
Kevin Pope
2faec9d1c0 Work on print history widget. 2014-09-24 19:14:31 -07:00
Kevin Pope
bda5ac173e More work on configuration page. 2014-09-23 16:11:06 -07:00
Kevin Pope
bdef196434 Changed main application to MVC. UI rework (Configuration Page esp. in progress). 2014-09-19 19:17:12 -07:00
Kevin Pope
e02655f847 Make controls more consistent looking. 2014-09-18 17:06:45 -07:00
Kevin Pope
73b6c8298b Added custom themed slider, added double slider. 2014-09-17 19:18:46 -07:00
larsbrubaker
390bc4451b another translation. 2014-09-11 09:55:15 -07:00
larsbrubaker
54f406a031 Make sure we can handle blank lines in Slice settings files (they have been added manually) 
Put in wipe tower and wipe shield (more work on dual extrusion)
 2014-09-10 10:01:13 -07:00
larsbrubaker
c9ffc3eb98 Made fixed width and height in button factory doubles. 2014-08-30 13:28:13 -07:00
gregory-diaz
c02e86441a Export X3g Stuff 2014-08-27 12:02:15 -07:00
larsbrubaker
0db380572b Put in a allow less than zero in print leveling. 2014-08-26 18:44:36 -07:00
Kevin Pope
c2721f5ef5 Added close and clear button to terminal window. Terminal window ui cleanup. 2014-08-26 18:09:23 -07:00
larsbrubaker
9e623a2f4a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 
Conflicts:
	StaticData/PrinterSettings/RoBo 3D/R1/setup.ini
	StaticData/Translations/Master.txt
 2014-08-26 12:09:17 -07:00
larsbrubaker
841ea5e071 Made RoBo default to MatterSlice 
Made consol draw faster
took out dead code
white space
 2014-08-26 12:06:16 -07:00
Kevin Pope
9e2eb6e267 Added turkish translation. Changes to default settings. 2014-08-26 11:45:47 -07:00
larsbrubaker
3771ec374f Getting the sync to print working better. 2014-08-18 16:42:04 -07:00
larsbrubaker
b707c9c7ff Put in some new slice settings for matter slice. 
Fixed some buttons to go onuithread
 2014-08-08 17:03:00 -07:00
larsbrubaker
4c846f08cb Made sure the launcher gets installed (made it a reference) 2014-07-08 18:05:20 -07:00
larsbrubaker
5e119a672f Made the third panel view keep its state much better. 
We can change printers now without the third panel changing tabs.
 2014-07-03 11:50:25 -07:00
larsbrubaker
b75ae71d24 Made 3D views editable while printing (if not the embedded view). 
Made the eeprom windows have the correct tab stops.
 2014-07-02 13:28:51 -07:00
kevinepope
0f47609de0 More polish to cloud monitor. 2014-06-29 15:14:14 -07:00
james jones
4e41d10b06 Getting it working with vs 2013. 2014-06-27 18:18:00 -07:00
larsbrubaker
30fbe6d855 Fixed color or gcode printing screen. 
sd card working all but cancel.
made max extrusion ratio go to 3 (which is 3mm to 1.75 conversion for gcode (mostly))
 2014-06-26 18:13:53 -07:00
larsbrubaker
7fd9597c8b Made the end of gcode printing not throw and exception. 2014-06-25 17:57:10 -07:00
larsbrubaker
f5fe599a99 Merge remote-tracking branch 'Greg/development' into development 2014-06-25 17:28:34 -07:00
larsbrubaker
22cf4bfb2d Can now send to sd. 
Can print from sd (mostly)
can remove from sd.
 2014-06-25 17:28:28 -07:00
gregory-diaz
5d92863bcc Merge remote-tracking branch 'upstream/development' into development 
Conflicts:
	ConfigurationPage/PrinterConfigurationPage.cs
	StaticData/Translations/Master.txt
 2014-06-25 14:19:25 -07:00
gregory-diaz
8cb50c900c Added "Print Notification" option to Configuration Page. 2014-06-25 13:19:07 -07:00
larsbrubaker
fc9665e8a0 Added dialog to ask for remove from sd on remove from queue. 2014-06-24 18:53:17 -07:00
larsbrubaker
8c2ff38b41 Put in a go button with the cloud monitoring. 2014-06-24 14:26:14 -07:00
larsbrubaker
f78260fdfc More work on sd card printing. 2014-06-23 13:18:51 -07:00
kevinepope
c593396647 Added device type to Printer model. Refactoring changes. 2014-06-22 20:53:38 -07:00