Merge branch 'development'

Conflicts:
	blockly/core/xml.js
	blockscad/blockscad.js

fixed merge conflicts

blockly/core/xml.js

@@ -264,11 +264,13 @@ Blockly.Xml.domToWorkspace = function(workspace, xml) {
     // read in default color information.
     if (xmlChild.nodeName.toLowerCase() == 'color') {
       var col = xmlChild.getAttribute('rgba');
-      var colA = col.split(',');
-      if (colA.length == 3)
-      if (colA[0] >= 0 && colA[0] < 255)
-      if (colA[1] >= 0 && colA[1] < 255)
-      if (colA[2] >= 0 && colA[2] < 255) {
+      if (col == "undefined") {
+        // set color to default
+        found_color = true;
+        Blockscad.setColor(255, 128, 255);
+      }
+      else {
+        var colA = col.split(',');
         Blockscad.setColor(colA[0],colA[1],colA[2]);
         found_color = true;
       }

blockly/msg/json/de.json

@@ -59,8 +59,8 @@
 	"CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL": "Führe die Anweisung solange aus wie die Bedingung falsch (false) ist.",
 	"CONTROLS_FOR_HELPURL": "https://de.wikipedia.org/wiki/For-Schleif",
 	"CONTROLS_FOR_TOOLTIP": "Zähle die Variable \"%1\" von einem Startwert bis zu einem Zielwert und führe für jeden Wert eine Anweisung aus.",
-	"CONTROLS_FOR_INPUT_WITH": "Zähle",
-	"CONTROLS_FOR_INPUT_FROM_TO_BY": "von %1 bis %2 mit %3",
+	"CONTROLS_FOR_INPUT_WITH": "zähle",
+	"CONTROLS_FOR_INPUT_FROM_TO_BY": "von %1 bis %2 schritt %3",
 	"CONTROLS_FOREACH_HELPURL": "https://de.wikipedia.org/wiki/For-Schleife",
 	"CONTROLS_FOREACH_INPUT_ITEM": "Für Wert",
 	"CONTROLS_FOREACH_INPUT_INLIST": "aus der Liste",

blockscad/blockscad.js

@@ -633,7 +633,7 @@ Blockscad.readStlFile = function(evt) {
 };
 
 // Load Blockly's (and Blockscad's) language strings.
-console.log("trying to include message strings");
+// console.log("trying to include message strings");
 document.write('<script src="blockly/msg/js/' + BSUtils.LANG + '.js"></script>\n');
 document.write('<script src="blockscad/msg/js/' + BSUtils.LANG + '.js"></script>\n');
 
@@ -1817,7 +1817,7 @@ Blockscad.initLanguage = function() {
   document.head.parentElement.setAttribute('dir', rtl ? 'rtl' : 'ltr');
   document.head.parentElement.setAttribute('lang', BSUtils.LANG);
 
-  console.log("lang is:",BSUtils.LANG);
+  // console.log("lang is:",BSUtils.LANG);
 
   // Sort languages alphabetically.
   var languages = [];

blockscad/storage.js

@@ -16,7 +16,7 @@ Blockly.Xml = Blockly.Xml || {};
  * @private
  */
 BlocklyStorage.backupBlocks_ = function() {
-  console.log("in backupBlocks");
+  // console.log("in backupBlocks");
   if ('localStorage' in window) {
     // clear out old stuff from localStorage
     localStorage.clear();
@@ -71,7 +71,7 @@ BlocklyStorage.backupOnUnload = function() {
 BlocklyStorage.restoreBlocks = function() {
   var url = window.location.href.split('#')[0];
   url = url.split('?lang')[0];
-  console.log("url for restoring blocks is:",url);
+  // console.log("url for restoring blocks is:",url);
   var url2 = url + "proj_name";
   var url3 = url + "current_project";
   var url4 = url + "current_project_key";

blockscad/viewer.js

@@ -1332,8 +1332,9 @@ Blockscad.Processor.prototype = {
 
     var blob;
     if(format == "stla") {      
-      blob = this.currentObject.toStlString();        
-      blob = new Blob([blob],{ type: this.formatInfo(format).mimetype });
+      blob = this.currentObject.toStlString();      
+      // console.log("this format mimetype is:", this.formatInfo(format).mimetype); 
+      blob = new Blob([blob],{ type: "text/plain; charset=utf-8"});
     }
     else if(format == "stlb") {      
       blob = this.currentObject.toStlBinary({webBlob: true});     
@@ -1346,13 +1347,15 @@ Blockscad.Processor.prototype = {
         producer: "BlocksCAD "+Blockscad.version,
         date: new Date()
       });
-      blob = new Blob([blob],{ type: this.formatInfo(format).mimetype });
+      blob = new Blob([blob],{ type: "text/plain; charset=utf-8"});
     }  
     else if(format == "x3d") {
       blob = this.currentObject.toX3D();
+      blob = new Blob([blob],{ type: "text/plain; charset=utf-8"});
     }
     else if(format == "dxf") {
       blob = this.currentObject.toDxf();
+      blob = new Blob([blob],{ type: "text/plain; charset=utf-8"});
     }
     else {
       throw new Error("Not supported");
@@ -1362,6 +1365,9 @@ Blockscad.Processor.prototype = {
   
   supportedFormatsForCurrentObject: function() {
     if (this.currentObject instanceof CSG) {
+      // if safari, don't let them save stlb
+      if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1) 
+        return ["stla", "amf", "x3d"];
       return ["stlb", "stla", "amf", "x3d"];
     } else if (this.currentObject instanceof CAG) {
       return ["dxf"];
@@ -1400,7 +1406,7 @@ Blockscad.Processor.prototype = {
     }[format];
   },
 
-  generateAndSaveRenderedFile: function() {
+  generateAndSvaeRenderedFile: function() {
     var blob = this.currentObjectToBlob();
     var ext = this.selectedFormatInfo().extension;
 

imgs/de/torus.svg

@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="173.33546mm"
-   height="74.702179mm"
-   viewBox="0 0 614.18078 264.69276"
+   width="182.92386mm"
+   height="74.427254mm"
+   viewBox="0 0 648.15541 263.71862"
    id="svg4208"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -27,7 +27,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.71402898"
      inkscape:cx="489.58952"
-     inkscape:cy="-2.4141017"
+     inkscape:cy="-2.4141171"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -35,8 +35,8 @@
      inkscape:snap-global="false"
      inkscape:object-nodes="true"
      inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1858"
-     inkscape:window-height="1178"
+     inkscape:window-width="1304"
+     inkscape:window-height="746"
      inkscape:window-x="54"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -52,7 +52,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -60,7 +60,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-116.87792,-294.77042)">
+     transform="translate(-116.87792,-295.74454)">
     <path
        style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 329.38909,434.73022 30.72177,0"
@@ -256,6 +256,6 @@
          sodipodi:role="line"
          id="tspan4772-9"
          x="641.79846"
-         y="455.7511">faces</tspan></text>
+         y="455.7511">flächen</tspan></text>
   </g>
 </svg>