diff --git a/electron/package.json b/electron/package.json index 6aec6ab9..893e3609 100644 --- a/electron/package.json +++ b/electron/package.json @@ -10,10 +10,12 @@ "start": "electron --disable-direct-composition --in-process-gpu ." }, "devDependencies": { - "electron": "10.4.0", - "async-lock": "^1.2.8" + "electron": "10.4.0" }, "optionalDependencies": { "shapez.io-private-artifacts": "github:tobspr/shapez.io-private-artifacts#abi-v85" + }, + "dependencies": { + "async-lock": "^1.2.8" } } diff --git a/electron/yarn.lock b/electron/yarn.lock index cdeefc2c..8c5b1dec 100644 --- a/electron/yarn.lock +++ b/electron/yarn.lock @@ -503,6 +503,10 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +"shapez.io-private-artifacts@github:tobspr/shapez.io-private-artifacts#abi-v85": + version "0.1.0" + resolved "git+ssh://git@github.com/tobspr/shapez.io-private-artifacts.git#63adf7e0ea4b90c2a29053ce1f0ec9d573b3ac0a" + sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" diff --git a/fetch_from_upstream.bat b/fetch_from_upstream.bat new file mode 100644 index 00000000..77a7f9c9 --- /dev/null +++ b/fetch_from_upstream.bat @@ -0,0 +1,3 @@ +git fetch upstream +git reset --hard upstream/master +git push origin master --force \ No newline at end of file