gregory-diaz
c1c937a36e
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-03-19 10:13:12 -07:00
gregory-diaz
ed573deb2d
Changes to SaveAsWindow
2014-03-19 10:12:55 -07:00
larsbrubaker
3c52835a63
UUpdated clipperlib to latests.
2014-03-18 10:55:21 -07:00
larsbrubaker
22edd06781
Merge remote-tracking branch 'Greg/development' into development
...
Conflicts:
StaticData/Translations/Master.txt
2014-03-17 14:44:38 -07:00
larsbrubaker
7f8300bafc
Got pause, resume and cancel gcode into the settings and working in printer communication.
2014-03-17 14:41:36 -07:00
larsbrubaker
24129ae8be
Got pause, resume and cancel gcode into the settings and working in printer communication.
2014-03-17 14:41:26 -07:00
gregory-diaz
4405c356a5
Added code so that when Save As button is clicked an empty window is opened.
2014-03-17 13:53:29 -07:00
gregory-diaz
05ca828e69
Save As added to translations
2014-03-17 12:14:43 -07:00
gregory-diaz
2eda068c36
"Save As" option has been added to part transform (not yet functional).
2014-03-17 12:13:06 -07:00
gregory-diaz
383215e93e
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-03-17 10:28:51 -07:00
larsbrubaker
e850398daf
More translations found.
2014-03-17 08:05:51 -07:00
larsbrubaker
d74e59033a
Added a string helper that lets us use an extension method to format strings easier.
...
Added a string extension method for localize that makes it easier to get localized text
Moved code into these new methods.
Removed some strings from localizing (app names and copy write notice)
2014-03-16 10:23:56 -07:00
larsbrubaker
c6f471c7ca
Fixing up the localization file to always maintain the master file when in English
...
added localized start and end to gcode view
Made the TAZ baud rate correct
Some new localizations
2014-03-15 14:02:43 -07:00
larsbrubaker
b68cda8ffe
put it in the right place.
2014-03-15 11:59:30 -07:00
larsbrubaker
6b960a84ed
Put in labels for start and end gcode view scroll bars.
2014-03-15 11:58:48 -07:00
larsbrubaker
2937131f1c
Added the ability to set the start and ending ratio of a layer in the gcode renderer.
...
This lets us see the order of rendering in the gcode view (like gcode.ws).
2014-03-15 09:47:51 -07:00
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
