From 9b5811b8743e5d572529df52c79003c302e2b681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?imreallybadatnames=E2=84=A2=EF=B8=8F?=
<68000899+imreallybadatnames@users.noreply.github.com>
Date: Mon, 21 Dec 2020 20:49:35 +1100
Subject: [PATCH 1/5] fix "banancer" typo (#1030)
* fix "banancer" typo
* fix confusion "and output everything else on the right"
changed from "right" to "left" like in the original text
* translate logic gate names
---
translations/base-ru.yaml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/translations/base-ru.yaml b/translations/base-ru.yaml
index c103ea3f..bb77dfc9 100644
--- a/translations/base-ru.yaml
+++ b/translations/base-ru.yaml
@@ -511,20 +511,20 @@ buildings:
Фильтром, например.
logic_gate:
default:
- name: AND Gate
+ name: И
description: Издает значение "1" если оба входа положительны. (Положительный -
значит ресурс, цвет или логическое значение "1")
not:
- name: NOT Gate
+ name: НЕ
description: Издает значение "1" если вход не положительный. (Положительный -
значит ресурс, цвет или логическое значение "1")
xor:
- name: XOR Gate
+ name: Исключающее ИЛИ
description: Издает значение "1" только один из входов положительный.
(Положительный - значит ресурс, цвет или логическое значение
"1")
or:
- name: OR Gate
+ name: ИЛИ
description: Издает значение "1" если хотя бы один вход положительный.
(Положительный - значит ресурс, цвет или логическое значение
"1").
@@ -565,7 +565,7 @@ buildings:
unstacker:
name: Виртуальный Разъединитель
description: Виртуально извлекает самый верхний слой фигуры направо, а все
- остальное направо.
+ остальное налево.
stacker:
name: Виртуальный Объединитель
description: Виртуально помещает правый предмет поверх левого.
@@ -683,7 +683,7 @@ storyRewards:
reward_balancer:
title: Балансер
desc:
- Многофункциональный банансер разблокирован - Он используется для разделения и обьединения
+ Многофункциональный балансер разблокирован - Он используется для разделения и обьединения
потора предметов на несколько конвейеров!
reward_merger:
title: Компактный Соединитель
From b51c0fdbd43ac3f5be9c7bff9e241091ca542e68 Mon Sep 17 00:00:00 2001
From: dengr1065
Date: Fri, 25 Dec 2020 23:57:57 +0200
Subject: [PATCH 2/5] Replace gulp-sass with gulp-dart-sass (#1036)
---
gulp/css.js | 4 +-
gulp/package.json | 2 +-
gulp/yarn.lock | 258 +++++++++-------------------------------
src/css/animations.scss | 24 ++--
4 files changed, 77 insertions(+), 211 deletions(-)
diff --git a/gulp/css.js b/gulp/css.js
index 73a0a7cf..2b51f153 100644
--- a/gulp/css.js
+++ b/gulp/css.js
@@ -62,7 +62,7 @@ function gulptasksCSS($, gulp, buildFolder, browserSync) {
return gulp
.src("../src/css/main.scss", { cwd: __dirname })
.pipe($.plumber())
- .pipe($.sass.sync().on("error", $.sass.logError))
+ .pipe($.dartSass.sync().on("error", $.dartSass.logError))
.pipe(
$.postcss([
$.postcssCriticalSplit({
@@ -95,7 +95,7 @@ function gulptasksCSS($, gulp, buildFolder, browserSync) {
return gulp
.src("../src/css/main.scss", { cwd: __dirname })
.pipe($.plumber())
- .pipe($.sass.sync().on("error", $.sass.logError))
+ .pipe($.dartSass.sync().on("error", $.dartSass.logError))
.pipe(
$.postcss([
$.postcssCriticalSplit({
diff --git a/gulp/package.json b/gulp/package.json
index 90dc5501..28a83253 100644
--- a/gulp/package.json
+++ b/gulp/package.json
@@ -77,6 +77,7 @@
"gulp-cache": "^1.1.3",
"gulp-cached": "^1.1.1",
"gulp-clean": "^0.4.0",
+ "gulp-dart-sass": "^1.0.2",
"gulp-dom": "^1.0.0",
"gulp-flatten": "^0.4.0",
"gulp-fluent-ffmpeg": "^2.0.0",
@@ -90,7 +91,6 @@
"gulp-pngquant": "^1.0.13",
"gulp-postcss": "^8.0.0",
"gulp-rename": "^2.0.0",
- "gulp-sass": "^4.1.0",
"gulp-sass-lint": "^1.4.0",
"gulp-sftp": "git+https://git@github.com/webksde/gulp-sftp",
"gulp-terser": "^1.2.0",
diff --git a/gulp/yarn.lock b/gulp/yarn.lock
index c172cbab..12959102 100644
--- a/gulp/yarn.lock
+++ b/gulp/yarn.lock
@@ -1816,11 +1816,6 @@ async-each@^1.0.1:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-async-foreach@^0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
- integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
async-limiter@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -2261,13 +2256,6 @@ blob@0.0.5:
resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-block-stream@*:
- version "0.0.9"
- resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
- integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
- dependencies:
- inherits "~2.0.0"
-
bluebird@3.x.x, bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
@@ -2821,6 +2809,21 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+"chokidar@>=2.0.0 <4.0.0":
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
+ integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
+ dependencies:
+ anymatch "~3.1.1"
+ braces "~3.0.2"
+ glob-parent "~5.1.0"
+ is-binary-path "~2.1.0"
+ is-glob "~4.0.1"
+ normalize-path "~3.0.0"
+ readdirp "~3.5.0"
+ optionalDependencies:
+ fsevents "~2.1.2"
+
chokidar@^2.0.0, chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -3390,14 +3393,6 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
- integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
- dependencies:
- lru-cache "^4.0.1"
- which "^1.2.9"
-
cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -5404,16 +5399,6 @@ fsevents@~2.1.2:
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
-fstream@^1.0.0, fstream@^1.0.12:
- version "1.0.12"
- resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
- integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
- dependencies:
- graceful-fs "^4.1.2"
- inherits "~2.0.0"
- mkdirp ">=0.5 0"
- rimraf "2"
-
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -5454,13 +5439,6 @@ gaze@^0.5.1:
dependencies:
globule "~0.1.0"
-gaze@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
- integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
- dependencies:
- globule "^1.0.0"
-
generate-function@^2.0.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
@@ -5959,6 +5937,20 @@ gulp-cli@^2.2.0:
v8flags "^3.2.0"
yargs "^7.1.0"
+gulp-dart-sass@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz#20e33c236b48d557c91e8dfe67a2aef2b8a2e328"
+ integrity sha512-8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw==
+ dependencies:
+ chalk "^2.3.0"
+ lodash.clonedeep "^4.3.2"
+ plugin-error "^1.0.1"
+ replace-ext "^1.0.0"
+ sass "^1.26.3"
+ strip-ansi "^4.0.0"
+ through2 "^2.0.0"
+ vinyl-sourcemaps-apply "^0.2.0"
+
gulp-dom@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/gulp-dom/-/gulp-dom-1.0.0.tgz#f834d5299c09b85e11c32505044a2ebe86ae1375"
@@ -6112,20 +6104,6 @@ gulp-sass-lint@^1.4.0:
sass-lint "^1.12.0"
through2 "^2.0.2"
-gulp-sass@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-4.1.0.tgz#486d7443c32d42bf31a6b1573ebbdaa361de7427"
- integrity sha512-xIiwp9nkBLcJDpmYHbEHdoWZv+j+WtYaKD6Zil/67F3nrAaZtWYN5mDwerdo7EvcdBenSAj7Xb2hx2DqURLGdA==
- dependencies:
- chalk "^2.3.0"
- lodash "^4.17.11"
- node-sass "^4.8.3"
- plugin-error "^1.0.1"
- replace-ext "^1.0.0"
- strip-ansi "^4.0.0"
- through2 "^2.0.0"
- vinyl-sourcemaps-apply "^0.2.0"
-
"gulp-sftp@git+https://git@github.com/webksde/gulp-sftp":
version "0.1.6"
resolved "git+https://git@github.com/webksde/gulp-sftp#c8dfb20e290477eeed66a867406576d0c3d4fc6b"
@@ -6712,11 +6690,6 @@ imurmurhash@^0.1.4:
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-in-publish@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
- integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
-
indent-string@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -6752,7 +6725,7 @@ inherits@1:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -7296,7 +7269,7 @@ jpegtran-bin@^5.0.0:
bin-wrapper "^4.0.0"
logalot "^2.0.0"
-js-base64@^2.1.8, js-base64@^2.1.9:
+js-base64@^2.1.9:
version "2.5.1"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
@@ -8234,7 +8207,7 @@ memory-fs@^0.4.0, memory-fs@^0.4.1:
errno "^0.1.3"
readable-stream "^2.0.1"
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
@@ -8495,7 +8468,7 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -8572,7 +8545,7 @@ mute-stream@~0.0.4:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.12.1:
version "2.14.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -8645,24 +8618,6 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
-node-gyp@^3.8.0:
- version "3.8.0"
- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
- integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
- dependencies:
- fstream "^1.0.0"
- glob "^7.0.3"
- graceful-fs "^4.1.2"
- mkdirp "^0.5.0"
- nopt "2 || 3"
- npmlog "0 || 1 || 2 || 3 || 4"
- osenv "0"
- request "^2.87.0"
- rimraf "2"
- semver "~5.3.0"
- tar "^2.0.0"
- which "1"
-
node-libs-browser@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -8715,29 +8670,6 @@ node-releases@^1.1.29:
dependencies:
semver "^5.3.0"
-node-sass@^4.8.3:
- version "4.12.0"
- resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
- integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
- dependencies:
- async-foreach "^0.1.3"
- chalk "^1.1.1"
- cross-spawn "^3.0.0"
- gaze "^1.0.0"
- get-stdin "^4.0.1"
- glob "^7.0.3"
- in-publish "^2.0.0"
- lodash "^4.17.11"
- meow "^3.7.0"
- mkdirp "^0.5.1"
- nan "^2.13.2"
- node-gyp "^3.8.0"
- npmlog "^4.0.0"
- request "^2.88.0"
- sass-graph "^2.2.4"
- stdout-stream "^1.4.0"
- "true-case-path" "^1.0.2"
-
node-sri@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/node-sri/-/node-sri-1.1.1.tgz#041096d2b11f232b65dedc4c3ae1cb62babb54b0"
@@ -8751,13 +8683,6 @@ node.extend@^1.0.10:
has "^1.0.3"
is "^3.2.1"
-"nopt@2 || 3":
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
- integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
- dependencies:
- abbrev "1"
-
nopt@^4.0.1, nopt@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -8854,7 +8779,7 @@ npm-run-path@^4.0.0:
dependencies:
path-key "^3.0.0"
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+npmlog@^4.0.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -9165,7 +9090,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -10786,6 +10711,13 @@ readdirp@~3.4.0:
dependencies:
picomatch "^2.2.1"
+readdirp@~3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+ integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+ dependencies:
+ picomatch "^2.2.1"
+
readline2@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
@@ -10975,7 +10907,7 @@ request-promise-native@^1.0.5:
stealthy-require "^1.1.1"
tough-cookie "^2.3.3"
-request@^2.87.0, request@^2.88.0:
+request@^2.88.0:
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -11136,13 +11068,6 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
-rimraf@2, rimraf@^2.4.0, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
- integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
- dependencies:
- glob "^7.1.3"
-
rimraf@2.6.3, rimraf@~2.6.2:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -11150,6 +11075,13 @@ rimraf@2.6.3, rimraf@~2.6.2:
dependencies:
glob "^7.1.3"
+rimraf@^2.4.0, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+ integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+ dependencies:
+ glob "^7.1.3"
+
rimraf@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
@@ -11249,16 +11181,6 @@ sanitize-filename@^1.6.0, sanitize-filename@^1.6.2:
dependencies:
truncate-utf8-bytes "^1.0.0"
-sass-graph@^2.2.4:
- version "2.2.4"
- resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
- integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
- dependencies:
- glob "^7.0.0"
- lodash "^4.0.0"
- scss-tokenizer "^0.2.3"
- yargs "^7.0.0"
-
sass-lint@^1.12.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz#5fd2b2792e9215272335eb0f0dc607f61e8acc8f"
@@ -11287,6 +11209,13 @@ sass-unused@^0.3.0:
glob "^7.0.5"
gonzales-pe "^4.2.3"
+sass@^1.26.3:
+ version "1.30.0"
+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.30.0.tgz#60bbbbaf76ba10117e61c6c24f00161c3d60610e"
+ integrity sha512-26EUhOXRLaUY7+mWuRFqGeGGNmhB1vblpTENO1Z7mAzzIZeVxZr9EZoaY1kyGLFWdSOZxRMAufiN2mkbO6dAlw==
+ dependencies:
+ chokidar ">=2.0.0 <4.0.0"
+
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -11324,14 +11253,6 @@ schema-utils@^2.6.5:
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-scss-tokenizer@^0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
- integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
- dependencies:
- js-base64 "^2.1.8"
- source-map "^0.4.2"
-
seek-bzip@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
@@ -11373,11 +11294,6 @@ semver@^6.0.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-semver@~5.3.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
- integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
send@0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -11746,13 +11662,6 @@ source-map-url@^0.4.0:
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-source-map@^0.4.2:
- version "0.4.4"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
- integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
- dependencies:
- amdefine ">=0.0.4"
-
source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -11898,13 +11807,6 @@ statuses@~1.4.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-stdout-stream@^1.4.0:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
- integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
- dependencies:
- readable-stream "^2.0.1"
-
stealthy-require@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -12335,15 +12237,6 @@ tar-stream@~0.4.0:
readable-stream "^1.0.27-1"
xtend "^4.0.0"
-tar@^2.0.0:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
- integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
- dependencies:
- block-stream "*"
- fstream "^1.0.12"
- inherits "2"
-
tar@^4:
version "4.4.11"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.11.tgz#7ac09801445a3cf74445ed27499136b5240ffb73"
@@ -12706,13 +12599,6 @@ trim@^0.0.1:
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
-"true-case-path@^1.0.2":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
- integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
- dependencies:
- glob "^7.1.2"
-
truncate-utf8-bytes@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -13399,7 +13285,7 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-which@1, which@^1.1.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.1.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -13662,13 +13548,6 @@ yargs-parser@^18.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
- integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
- dependencies:
- camelcase "^3.0.0"
-
yargs@13.2.4:
version "13.2.4"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
@@ -13719,25 +13598,6 @@ yargs@^15.4.1:
y18n "^4.0.0"
yargs-parser "^18.1.2"
-yargs@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
- integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
- dependencies:
- camelcase "^3.0.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^1.4.0"
- read-pkg-up "^1.0.1"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^1.0.2"
- which-module "^1.0.0"
- y18n "^3.2.1"
- yargs-parser "^5.0.0"
-
yargs@^7.1.0:
version "7.1.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"
diff --git a/src/css/animations.scss b/src/css/animations.scss
index 3e9b22f7..0716da70 100644
--- a/src/css/animations.scss
+++ b/src/css/animations.scss
@@ -1,13 +1,19 @@
-@include MakeAnimationWrappedEvenOdd(0.2s ease-in-out, "changeAnim") {
- 0% {
- transform: scale(1, 1);
+@each $num in ("changeAnimEven", "changeAnimOdd") {
+ @keyframes #{$animName} {
+ 0% {
+ transform: scale(1, 1);
+ }
+
+ 50% {
+ transform: scale(1.03, 1.03);
+ }
+
+ 100% {
+ transform: scale(1, 1);
+ }
}
- 50% {
- transform: scale(1.03, 1.03);
- }
-
- 100% {
- transform: scale(1, 1);
+ .#{$animName} {
+ animation: $animName 0.2s ease-in-out;
}
}
From 6f486767b64074821951ef23f5a4c0708f4e3c72 Mon Sep 17 00:00:00 2001
From: dengr1065
Date: Tue, 29 Dec 2020 11:39:52 +0200
Subject: [PATCH 3/5] SCSS: Fix refactoring variable name (#1042)
---
src/css/animations.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/css/animations.scss b/src/css/animations.scss
index 0716da70..16ba7fd1 100644
--- a/src/css/animations.scss
+++ b/src/css/animations.scss
@@ -1,4 +1,4 @@
-@each $num in ("changeAnimEven", "changeAnimOdd") {
+@each $animName in ("changeAnimEven", "changeAnimOdd") {
@keyframes #{$animName} {
0% {
transform: scale(1, 1);
From 38a69fbd38ed3520d1676e266a4a8ea359b26ebd Mon Sep 17 00:00:00 2001
From: Kexogg <65514050+Kexogg@users.noreply.github.com>
Date: Tue, 29 Dec 2020 14:40:46 +0500
Subject: [PATCH 4/5] Update base-ru.yaml (#1038)
Fixed incorrect description of Tick Rate, added new translations.
If possible, please change fallback for cyrillic font. It's literally Times New Roman (in-game)
---
translations/base-ru.yaml | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/translations/base-ru.yaml b/translations/base-ru.yaml
index bb77dfc9..3b16edd4 100644
--- a/translations/base-ru.yaml
+++ b/translations/base-ru.yaml
@@ -86,10 +86,10 @@ mainMenu:
changelog: Список изменений
importSavegame: Импорт
openSourceHint: Это игра с открытым исходным кодом!
- discordLink: Официальный Дискорд сервер!
+ discordLink: Официальный Дискорд сервер
helpTranslate: Помоги с переводом!
browserWarning: Извините, но игра работает медленно в вашем браузере!
- Приобретите полную версию или загрузите Chrome чтобы ознакомится с игрой
+ Приобретите полную версию или загрузите Google Chrome, чтобы ознакомится с игрой
в полной мере.
savegameLevel: Уровень
savegameLevelUnknown: Неизвестный уровень
@@ -753,7 +753,7 @@ settings:
general: Основные
userInterface: Интерфейс
advanced: Продвинутые
- performance: Performance
+ performance: Производительность
versionBadges:
dev: Разработчик
staging: Постановка
@@ -803,11 +803,8 @@ settings:
dark: Темная
light: Светлая
refreshRate:
- title: Частота обновления
- description: Если у вас монитор 144 Гц, измените частоту обновления здесь, чтобы
- игра правильно выглядела при более высоких частотах обновления.
- Это может уменьшить FPS, если ваш компьютер работает слишком
- медленно.
+ title: Тикрейт
+ description: Определяет, сколько игровых тиков происходит в секунду. Более высокая частота тиков означает лучшую точность, но также и худшую производительность. На низких тикрейтах симуляция может быть неточной.
alwaysMultiplace:
title: Многократное размещение
description: Если включено, все здания останутся выбранными после размещения,
@@ -872,7 +869,7 @@ settings:
title: Громкость Звука
description: Задает громкость звуковых эффектов.
musicVolume:
- title: Music Volume
+ title: Громкость музыки
description: Задает громкость музыки.
lowQualityMapResources:
title: Низкое качество ресурсов на карте
@@ -999,7 +996,7 @@ about:
Если вы хотите внести свой вклад игре - shapez.io в github.
- Эта игра не была бы возможна без большого сообщества в дискорде, которое собралось вокруг моих игр - Вам действительно стоит присоединиться к
+ Эта игра не была бы возможна без большого сообщества в Discord, которое собралось вокруг моих игр - Вам действительно стоит присоединиться к
серверу Discord!!
Саундтрек сделал Peppsen - Он потрясающий.
From abb7ac782d8056b096fc5d8ac560d7874f772132 Mon Sep 17 00:00:00 2001
From: Gumball73 <66757746+Gumball73@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:30:41 +0000
Subject: [PATCH 5/5] Update base-pt-PT.yaml (#1046)
Fix some typos.
---
translations/base-pt-PT.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/translations/base-pt-PT.yaml b/translations/base-pt-PT.yaml
index 62d3b333..300435c8 100644
--- a/translations/base-pt-PT.yaml
+++ b/translations/base-pt-PT.yaml
@@ -895,7 +895,7 @@ settings:
lembra-te de experimentares!
disableTileGrid:
title: Desativar Grelha
- description: Desativar a grelha pode ajudar com o desempenho. Isto também fazz o
+ description: Desativar a grelha pode ajudar com o desempenho. Isto também faz o
jogo parecer mais limpo!
clearCursorOnDeleteWhilePlacing:
title: Limpar Cursor com Clique Direito
@@ -905,7 +905,7 @@ settings:
direito do rato enquanto colocas um edifício.
lowQualityTextures:
title: Texturas de baixa qualidade (Feio)
- description: sa texturas de baixa qualidade para melhorar o desempenho. sto vai
+ description: Usa texturas de baixa qualidade para melhorar o desempenho. Isto vai
tornar o jogo parecer muito feio!
displayChunkBorders:
title: Mostrar bordas de limites (chunk borders)
@@ -928,12 +928,12 @@ settings:
velociade depende da definição de velocidade de movimentação.
zoomToCursor:
title: Zoom towards Cursor
- description: If activated the zoom will happen in the direction of your mouse
- position, otherwise in the middle of the screen.
+ description: Se ativado o zoom será na direção da posição
+ do teu rato, de outra forma será para o centro do ecrã.
mapResourcesScale:
- title: Map Resources Size
- description: Controls the size of the shapes on the map overview (when zooming
- out).
+ title: Tamanho de Recursos no Mapa
+ description: Controla o tamanho das formas na visão geral do mapa (aplicando
+ zoom out).
rangeSliderPercentage: %
keybindings:
title: Atalhos