Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge changes from klein0r #1334

Merged
merged 15 commits into from
Jun 13, 2023
Merged

Merge changes from klein0r #1334

merged 15 commits into from
Jun 13, 2023

Commits on Jun 12, 2023

  1. Merge changes from klein0r

    @GermanBluefox
    GermanBluefox committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7e36681 View commit details
    Browse the repository at this point in the history

  2. var => const for blockly

    @GermanBluefox
    GermanBluefox committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7f8db12 View commit details
    Browse the repository at this point in the history

  3. this.Blockly.Xml => this.Blockly.utils.xml

    @GermanBluefox
    GermanBluefox committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    0256905 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge branch 'master' into blockly_9_3_3_1 

    # Conflicts:
#	src/public/google-blockly/own/blocks_logic.js
#	src/public/google-blockly/own/blocks_number.js
#	src/public/google-blockly/own/blocks_text.js
#	src/public/google-blockly/own/blocks_words.js
    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    8fad3bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into blockly_9_3_3_1 

    # Conflicts:
#	src/public/google-blockly/own/blocks_number.js
#	src/public/google-blockly/own/blocks_switch.js
#	src/public/google-blockly/own/blocks_system.js
#	src/public/google-blockly/own/blocks_text.js
#	src/public/google-blockly/own/blocks_trigger.js
    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cfea708 View commit details
    Browse the repository at this point in the history

  3. Update blocks_trigger.js

    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    bdb7d70 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into blockly_9_3_3_1

    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    bf99fea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into blockly_9_3_3_1 

    # Conflicts:
#	src/public/google-blockly/own/field_cron.js
#	src/public/google-blockly/own/field_script.js
    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    81edc39 View commit details
    Browse the repository at this point in the history

  6. Update blocks_trigger.js

    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    1d56119 View commit details
    Browse the repository at this point in the history

  7. Updated blocks

    @klein0r
    klein0r committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    bba511d View commit details
    Browse the repository at this point in the history

  8. Custom procedures fix

    @klein0r
    klein0r committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    87654ba View commit details
    Browse the repository at this point in the history

  9. Custom procedures fix

    @klein0r
    klein0r committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    91a8f5b View commit details
    Browse the repository at this point in the history

  10. Fix toggle breakpoint

    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    ef86a95 View commit details
    Browse the repository at this point in the history

  11. Update blocks_text.js

    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    70b53d6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1337 from klein0r/blockly_9_3_3_1 

    Custom procedures fix
    @GermanBluefox
    GermanBluefox committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    97dc84f View commit details
    Browse the repository at this point in the history