Conflicts:
src/ui/ProcedureSpecEditor.as

Save scripts and update palette when undeleting a block or comment

Fix args appearing when variable names contain %n, etc.

Show slider min/max as default values in dialog

Added full arc to Bezier curve conversion support

Check built-in extension block spec translations for argument mismatches

Fix pasting in bitmap editor

Fix small offset when adding shapes in bitmap editor

Block mouse interaction when picking a color

Send key press events for scroll wheel like Scratch 1.4

Rename duplicate parameters in procedure editor

Allow holding shift to scroll horizontally with the mouse wheel

Block spec escapes

Fix a typo (font-weight => font-style)

Update palette when auto-creating variables

Fix bubbles for blocking reporters

Added ability to call a function on dialog cancel

Revert "Use setSVGData() to properly clear a costume that failed to load...

https://app.getsentry.com/scratchteam/scratch-flash/group/18498222/

This also allows extensions to use built-in menus if they do not define menus of the same name.

Check for internal extension before fixing URL

Only internal extensions need their URLs fixed. We should probably find
a better way to do this,...

Redraw when changing volume or tempo

Fix bitmapResolution in ui.media.MediaInfo

Refactor for extensions

Allow only one HTTP poll at a time per extension

Fix layout for show button in small stage mode

Conditionally add or skip the extension add button

Fix renaming sounds in nested blocks

Now checking mic for null before starting recording mode.

Use setSVGData() to properly clear a costume that failed to load

Fix for parameter focusing

Add block color editor to the Edit menu

Still fixes #414

Fixes #414

Set zoom to 100% after creating a costume from the camera

Update references nested in other blocks

Fix unintended sprite dragging while drawing

Reset scale when restoring block state

Changes to link to design principles of scratch, explain about PRs for new features

Fix IllegalOperationError when running scratch-flash

Added a default implementation for the username block when offline

Update procedure spec editor label font to match block label font

Previously, ScratchExtension was using the File class to fixup JS extensions' URLs. This only co...