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

284 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
7afaf66fb4 Merge remote-tracking branch 'Greg/development' into development 2014-10-09 11:31:11 -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
gregory-diaz
34f5edfee0 Cleaned up Static Data removed the extra Revolution3D Profile, and corrected the spelling of Velleman in printer white list 2014-10-09 11:16:42 -07:00
gregory-diaz
1066a5a996 Added printer profile for Organic Thinking System 2014-10-08 16:09:13 -07:00
gregory-diaz
7985254f99 Merge remote-tracking branch 'upstream/development' into development 2014-10-08 14:28:55 -07:00
gregory-diaz
31a6ad3c78 Added printer profile for Organic Thinking System 2014-10-08 14:24:21 -07:00
larsbrubaker
eff820f567 Turned on avaid_crossing_perimeters by default. 2014-10-08 11:28:59 -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
larsbrubaker
b306be1dd5 Merge branch '1.1.3' into development 2014-09-25 16:20:12 -07:00
larsbrubaker
fe88e63c5e Put zOffset into MatterSlice and implemented the UI for it. 
Put Robo z offset at 1 for the R1
Turned off 2Point leveling
Turned off auto run print leveling
 2014-09-25 11:39:39 -07:00
larsbrubaker
f1272a91e1 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-09-25 11:01:39 -07:00
larsbrubaker
f39787fa8f Putting in more multi extruder support 
Reorganizing the slice settings layouts
 2014-09-25 11:01:15 -07:00
Kevin Pope
2faec9d1c0 Work on print history widget. 2014-09-24 19:14:31 -07:00
larsbrubaker
4e10293225 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-09-24 11:07:31 -07:00
larsbrubaker
c04e4c81dd Working on multi extruder ui support 2014-09-24 11:07:08 -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
gregory-diaz
01f69dacb6 Changed printer name from Infinity to INF3D-SPE in the correct static data folder 2014-09-09 10:18:00 -07:00
gregory-diaz
519f96ebdd Merge remote-tracking branch 'upstream/development' into development 2014-09-09 10:03:55 -07:00
gregory-diaz
b49a398214 Changed Revolution 3D model name in static data from 'Infinity' to INF3D-SPE 2014-09-09 10:02:19 -07:00
kevinepope
9f365c51f5 Changed folder name, added base settings for r3dp 2014-09-05 17:05:52 -07:00
larsbrubaker
2ac4bed04e Merge commit '905794eaa6' into 1.1.3 2014-09-05 16:14:04 -07:00
gregory-diaz
dd0a63dd77 Merge remote-tracking branch 'upstream/development' into development 2014-09-05 15:26:33 -07:00
gregory-diaz
905794eaa6 Added new material and quality presets for Revolution 3d 2014-09-05 15:25:59 -07:00
Kevin Pope
0b8e4fc092 Fix whitelisted makes. 2014-09-03 17:32:38 -07:00
gregory-diaz
c907b98560 Changing default watermark image back to the MatterControl logo(set the wrong one in previous commit). 2014-09-02 16:39:10 -07:00
gregory-diaz
60512e7667 Merge remote-tracking branch 'upstream/1.1.3' into development 2014-09-02 16:35:09 -07:00
gregory-diaz
ce67d6e004 Added Printer and Slice Setting information for Me3D and Revolution 3D 2014-09-02 16:33:17 -07:00
gregory-diaz
be348cedc2 Edited OEMSettings.json file to include Me3D and Revolution 3D 2014-09-02 16:30:11 -07:00