hard merge with xcratch#1
Open
CrispStrobe wants to merge 68 commits into
Open
Conversation
cache files from same site and assets.scratch.mit.edu
This uses setFormatMessage() in the entry object of an extension.
# Conflicts: # package.json
Change to do make PWA assets before start dev-server
Ref: - Make backpack use localStorage to save everything; updated readme; ma… · scratchfoundation/scratch-gui@1fea87d scratchfoundation@1fea87d - Detect mouse button; multiple extensions; backpack corruption fix · scratchfoundation/scratch-gui@fb005b8 scratchfoundation@fb005b8
- Fix crash of the backpack for un-supported image - Add script to link vm and make editor debug with vscode - Add open project from URL by query parameter - Show whole shape of blocks when mouse over the pallet - Merge LLK/scratch-gui #0.1.0-prerelease.20220223164758
# Conflicts: # src/lib/storage.js # webpack.config.js
# Conflicts: # package.json
(cherry picked from commit 35d58c2)
(cherry picked from commit 0ecc560)
(cherry picked from commit 7acc7c6)
# Conflicts: # .vscode/launch.json # .vscode/tasks.json
# Conflicts: # package.json
# Conflicts: # .gitignore # package.json # scripts/.eslintrc.js # src/components/menu-bar/menu-bar.jsx # webpack.config.js
when using Node.js 17 or higher
# Conflicts: # .gitignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves
What Github issue does this resolve (please include link)?
Proposed Changes
Describe what this Pull Request does
Reason for Changes
Explain why these changes should be made
Test Coverage
Please show how you have added tests to cover your changes
Browser Coverage
Check the OS/browser combinations tested (At least 2)
Mac
Windows
Chromebook
iPad
Android Tablet