Merge pull request #680 from parallaxinc/demo

Merging demo tip into master for Public Release #1 milestone.

Author: PropGit

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties

@@ -26,8 +26,8 @@ footer.licenselink = License
 footer.changelog = Change log
 footer.librarieslink = External libraries
 footer.clientdownloadlink = BlocklyProp-client
-footer.appversion = v0.91
-footer.buildversion = 184
+footer.appversion = v0.92
+footer.buildversion = 199
 
 html.content_missing = Content missing
 

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations_nl.properties

@@ -11,8 +11,8 @@ menu.your_projects = Jouw projecten
 menu.project_list = Projecten lijst
 menu.profile = Profiel
 
-footer.appversion = v0.91
-footer.buildversion = 184
+footer.appversion = v0.92
+footer.buildversion = 199
 
 home.latest_projects.title = Laatste projecten
 home.c_project.title = C Project

src/main/webapp/cdn/blockly/generators/propc/console.js

@@ -35,6 +35,7 @@ Blockly.Blocks.console_print = {
         this.appendValueInput('MESSAGE')
             .setCheck('String')
             .appendField("Terminal print text");
+        this.setInputsInline(true);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
     }

src/main/webapp/cdn/blockly/generators/propc/oled.js

@@ -337,10 +337,10 @@ Blockly.Blocks.oled_print_number = {
             .appendField("OLED print number ")
         this.appendDummyInput()
             .appendField(new Blockly.FieldDropdown([
-                ["DEC", "DEC"],
-                ["BIN", "BIN"],
-                ["OCT", "OCT"],
-                ["HEX", "HEX"]
+                ["Decimal", "DEC"],
+                ["Hexadecimal", "HEX"],
+                ["Binary", "BIN"],
+                //["OCT", "OCT"],
             ]), "type");
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);

src/main/webapp/cdn/blockly/language/common/base.js

@@ -48,7 +48,7 @@ Blockly.Blocks.base_delay = {
     init: function () {
         this.setColour(colorPalette.getColor('programming'));
         this.appendValueInput("DELAY_TIME", 'Number')
-                .appendField("delay (ms)")
+                .appendField("pause (ms)")
                 .setCheck('Number');
         this.setInputsInline(true);
         this.setPreviousStatement(true, null);