larsbrubaker
14de4d8b49
Deleted the mattercontrolarduino.inf (not useful to getting drivers installed)
...
Removed dead code
adding in arduino.inf for install.
2014-03-13 16:20:12 -07:00
larsbrubaker
a19d3034d7
Merge branch '1.0.5' into development
...
Conflicts:
VersionManagement/WebRequestHandler.cs
2014-03-13 15:50:54 -07:00
larsbrubaker
a74dcce12f
The name of ImageBMPIO changed to ImageIO
2014-03-12 15:37:19 -07:00
Kevin Pope
c970ca7de4
Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into 1.0.5
2014-03-12 15:19:21 -07:00
gregory-diaz
f33098043a
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-03-12 15:14:32 -07:00
Kevin Pope
c20f93ba2f
Added OnRequestComplete event to web request handler.
2014-03-12 14:58:24 -07:00
Kevin Pope
9e8bdc995f
Use 'MACHINE_TYPE' instead of 'PROTOCOL_VERSION' to determine firmware version.
2014-03-12 14:57:25 -07:00
larsbrubaker
4af2bfa0d9
Removing dead code
2014-03-11 21:33:01 -07:00
gregory-diaz
18ea1a91fb
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-03-11 17:43:38 -07:00
larsbrubaker
fd6d04560b
default to English not the testing French.
2014-03-11 15:57:22 -07:00
larsbrubaker
b5367fecc8
Merge remote-tracking branch 'Greg/development' into development
2014-03-11 15:25:19 -07:00
larsbrubaker
5c0993f83e
Changed the interface to translations.
2014-03-11 15:24:47 -07:00
larsbrubaker
5a1484ca86
Made it not save out English translations.
...
Made it create files and directories as necessary.
2014-03-11 15:10:57 -07:00
larsbrubaker
2def10590e
Made the first pass of actually doing the localizations.
...
There is now a small bit of Spanish localization.
Moved the LocalizedString into MC so that it is clearer that translation files aren't saved.
2014-03-11 15:10:11 -07:00
gregory-diaz
0f1c1ba358
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-03-11 13:01:59 -07:00
larsbrubaker
30ba01ddab
Merge remote-tracking branch 'origin/development' into development
2014-03-11 11:09:50 -07:00
larsbrubaker
ab0950e0d0
Merge branch '1.0.5' into development
...
Conflicts:
MatterControl.csproj
2014-03-11 11:09:38 -07:00
larsbrubaker
9d600947d1
Putting in layer render partial slider
2014-03-11 10:41:39 -07:00
gregory-diaz
d3b4476306
first attempt at fixing file extension problem in print library
2014-03-10 17:04:09 -07:00
larsbrubaker
f7e5d0f64b
Merge remote-tracking branch 'Chaz/master' into 1.0.5
2014-03-10 10:59:19 -07:00
csselph
09c4788a44
Corrected Orion ABS temperature settings in Slice Configuration file
2014-03-08 15:22:52 -08:00
larsbrubaker
a4d41acfd0
Fixed a terrible problem with the gcode parsing that resulted in print leveling not working.
...
Made the not printing commands also go through bed leveling when enabled.
2014-03-07 16:09:07 -08:00
larsbrubaker
fd0db7b991
Don't show the part sheet menu on the mac (the pdf library is not working on mac).
2014-03-07 15:21:21 -08:00
larsbrubaker
411cde9414
Merge remote-tracking branch 'origin/1.0.5' into 1.0.5
...
Conflicts:
PartsSheet.cs
2014-03-07 14:50:13 -08:00
larsbrubaker
24042e9a34
Just adding some comments for clarity.
2014-03-07 14:46:23 -08:00
Kevin Pope
e3c5924ef2
Made save dialogs for pdf import/export Mac compatible.
2014-03-07 11:06:59 -08:00
larsbrubaker
8750be422e
Took out Iconic.Zip.dll
...
Put in ICSharpCode.SharpZipLib.dll
2014-03-07 10:12:55 -08:00
larsbrubaker
041bd7f599
Put in more copy write notices
...
Took out Iconic.Zip.dll
Put in ICSharpCode.SharpZipLib.dll
put the add button next to the edit button in the 3d view controls.
Made web request handler work on a background task rather than a thread
2014-03-07 09:50:41 -08:00
larsbrubaker
db8ff174c2
Merge remote-tracking branch 'origin/development' into development
2014-03-05 21:04:32 -08:00
larsbrubaker
f52eae0f33
Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into development
2014-03-05 21:04:28 -08:00
larsbrubaker
26d2730516
Fixing some errors with exporting gcode to a folder when the STL not present.
2014-03-05 13:45:07 -08:00
Kevin Pope
9238fbdf97
Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into 1.0.5
2014-03-05 12:17:17 -08:00
Kevin Pope
5e96cc9b5d
Added named widget to ManualPrinterControls
...
Added firmware check to PrinterCommunication
Added event hook to MainSlidePanel for reload of Advanced Controls
2014-03-05 12:16:52 -08:00
larsbrubaker
a035aed52e
Fixed a bug with export to folder not working if done a second time.
...
Made the slicing queue report its status on the uithread.
2014-03-05 12:00:37 -08:00
larsbrubaker
66675ff2b4
And the project file didn't save until I built it again.
2014-03-05 10:35:41 -08:00
larsbrubaker
0cebab830a
Moved frosted serial into agg
...
changed some namespaces
2014-03-05 10:33:19 -08:00
larsbrubaker
1ea4162948
the interface in gcode changed and this is just to keep in synch with it.
2014-03-04 13:42:30 -08:00
larsbrubaker
1e5e8d672a
Deleted a bunch of OnMouse code that did not add value.
...
Merge remote-tracking branch 'origin/1.0.5' into development
Conflicts:
PartPreviewWindow/GcodeViewBasic.cs
2014-03-04 07:32:11 -08:00
Kevin Pope
82740d3222
Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into 1.0.5
2014-03-03 16:32:21 -08:00
Kevin Pope
48e68b9f8e
Fixed issue where bed temperature and extruder temperature were not being set to zero.
2014-03-03 16:31:51 -08:00
larsbrubaker
370ee8c86d
Making sure we are releasing some EventHandlers so we don't hold onto memory.
2014-03-03 15:50:23 -08:00
Kevin Pope
2cf0fa8ad9
Updated R3D support material threshold from 30 degrees to 40 degrees.
2014-03-03 11:42:22 -08:00
larsbrubaker
f15b8c31aa
Merge branch 'development-kp' into development
2014-03-03 10:15:26 -08:00
larsbrubaker
841ddc2a2c
Using the new GetFirstNumberAfter interface in GCodeFile
2014-03-03 10:15:21 -08:00
larsbrubaker
afc8d156fd
Got more of the new layout code not crashing.
...
Sped up gcode parsing a bit (almost back to what it was).
2014-03-03 08:03:23 -08:00
larsbrubaker
621f91f4e1
Always show memory display in debug.
2014-03-02 17:01:49 -08:00
larsbrubaker
e3c70b0268
Removed all the internal performance monitoring in favor of an external tool.
2014-03-02 15:28:47 -08:00
larsbrubaker
5f364b4db7
Don't know how I left this (edited during debug?).
2014-03-01 23:30:19 -08:00
larsbrubaker
f2b11e2a33
Merge remote-tracking branch 'origin/development-kp' into development
...
Conflicts:
PrinterControls/ManualPrinterControls.cs
2014-03-01 23:27:34 -08:00
larsbrubaker
242b38bd13
Made the thumbnail thread a background task rather than a thread so that it will free the memory used when creating the thumbnail when done.
2014-03-01 22:28:27 -08:00
