merge-upstream: change dependencies (temporarily)

README.md

@@ -6,7 +6,7 @@ to run snail ide on your computer, you'll need nvm (node version manager).<br>
 type ``nvm install 16`` then ``nvm use 16`` in your terminal. (if your on windows, accept the uac prompts)<br>
 then your gonna need pnpm. there may be other ways to install snail ides dependencies without pnpm, but right now you'll need it. you can install it by typing ``npm install -g pnpm``. <br>
 after you install pnpm, clone the snail ide gui with ``git clone https://github.com/snail-ide/snail-ide.github.io``.<br>
-then run ``pnpm i --shamefully-hoist``. after that, you can type ``npm start`` or ``pnpm start`` or ``yarn start`` if you have yarn.<br/>
+then run ``NODE_OPTIONS=--openssl-legacy-provider pnpm i --shamefully-hoist``. after that, you can type ``npm start`` or ``pnpm start`` or ``yarn start`` if you have yarn.<br/>
 if you want to use node 17+ , you'll have to add the enviroment variable `NODE_OPTIONS` with the content `--openssl-legacy-provider` before the start command.<br/>
 on linux/github codespaces you can do that by running the command `export NODE_OPTIONS=--openssl-legacy-provider`.
 

package.json

@@ -83,14 +83,14 @@
     "redux": "3.7.2",
     "redux-throttle": "0.1.1",
     "scratch-audio": "github:PenguinMod/PenguinMod-Audio#develop",
-    "scratch-blocks": "github:Snail-IDE/snail-blocks#develop-builds",
+    "scratch-blocks": "github:Snail-IDE/snail-blocks#merge-upstream",
     "scratch-paint": "github:Snail-IDE/Snail-IDE-Paint#develop",
     "scratch-render": "github:PenguinMod/PenguinMod-Render",
     "scratch-render-fonts": "1.0.0-prerelease.20210401210003",
     "scratch-storage": "github:PenguinMod/PenguinMod-Storage#develop",
     "scratch-svg-renderer": "github:TurboWarp/scratch-svg-renderer#develop",
     "scratch-translate-extension-languages": "^1.0.6",
-    "scratch-vm": "github:Snail-IDE/Snail-IDE-Vm",
+    "scratch-vm": "github:Snail-IDE/Snail-IDE-Vm#merge-upstream",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.23.1",
     "sweetalert2": "^11.12.3",