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
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
larsbrubaker
b8b3370eb6
Fixed lay flat with groups
2014-10-10 09:30:44 -07:00
larsbrubaker
56ec618142
Convert amfs to stls at slice time when needed
2014-10-09 16:05:51 -07:00
larsbrubaker
c7a6281eb5
Put back in windows file dialog dependency.
2014-10-09 15:22:04 -07:00
gregory-diaz
cfd94ecf27
Localization for untranslated strings
2014-10-09 14:33:55 -07:00
Kevin Pope
a6bf457a54
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-09 14:31:29 -07:00
Kevin Pope
c921bd361d
Fix async settings load from ini file.
2014-10-09 14:30:59 -07:00
larsbrubaker
c7eb0c9813
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-09 14:11:02 -07:00
larsbrubaker
d8010a3116
We can select parts again.
...
We don't automatically change the selected mouse state.
2014-10-09 14:10:17 -07:00
Kevin Pope
b709027236
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-09 12:24:18 -07:00
Kevin Pope
3f0850a752
UI related updates. Work on formatting of print history and print library items. Made slice settings import work asynchronously.
2014-10-09 12:23:31 -07:00
larsbrubaker
7afaf66fb4
Merge remote-tracking branch 'Greg/development' into development
2014-10-09 11:31:11 -07:00
larsbrubaker
9270596726
Merge remote-tracking branch 'origin/1.1.3' into development
2014-10-09 11:30:39 -07:00
larsbrubaker
6f0b231c24
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-10-09 11:29:56 -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
84f7f438bc
Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development
2014-10-09 11:17:20 -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
Kevin Pope
0efbaacd9f
Merge commit ' 7985254f99' into development
2014-10-09 10:33:19 -07:00
Kevin Pope
67b4749063
Fix solution version.
2014-10-08 19:15:04 -07:00
gregory-diaz
4129d97e96
Added Printer profile for Organic Thinking Systems
2014-10-08 16:43:05 -07:00
larsbrubaker
2783f79818
Merge remote-tracking branch 'Greg/development' into development
2014-10-08 16:35:36 -07:00
larsbrubaker
3a39e79580
Got the rotate and scale working again (with groups)
...
Took out some dead code.
Making going into edit mode not do any work.
Changing split to group and ungroup
2014-10-08 16:34:25 -07:00
gregory-diaz
1066a5a996
Added printer profile for Organic Thinking System
2014-10-08 16:09:13 -07:00
gregory-diaz
4873daeee3
add to library form queue functionality
2014-10-08 16:09:11 -07:00
gregory-diaz
bda4986da2
Added class for new theme selector window that will link to the Configuration tab. UI is mostly done, code needs to be formatted more coherently, and save theme functionality is not there!
2014-10-08 16:09:08 -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
