Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work

This commit is contained in:
Gregory Diaz 2015-05-21 17:44:27 -07:00
commit 5f9d67422c
6 changed files with 11 additions and 4 deletions

View file

@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private static string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
private static string pressGenerateMessage = "Press 'generate' to view layers".Localize();
private static string fileNotFoundMessage = "File not found on disk.".Localize();
private static string fileTooBigToLoad = "GCode file too big to load for '{0}'.".Localize();
private static string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize();
private Vector2 bedCenter;
private Vector3 viewerVolume;