From a2d9fe40ea21010e2621dd901a3b181498b3b897 Mon Sep 17 00:00:00 2001 From: teoxoy <28601907+teoxoy@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:43:59 +0200 Subject: [PATCH] update to Factorio v2.0.68 --- package-lock.json | 24 ++++++++++---------- packages/editor/package.json | 2 +- packages/editor/src/UI/controls/functions.ts | 3 +-- packages/exporter/src/main.rs | 2 +- tsconfig.json | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca65d432..d8e0113a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3294,6 +3294,17 @@ "node": ">= 0.8.0" } }, + "node_modules/typed-factorio": { + "version": "3.31.0", + "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-3.31.0.tgz", + "integrity": "sha512-GOQYxv0acTyj+7UnEANNWfx31m70krnMPQ53XMy7tHC381S2AV76CboSHAkVAQOwCaCNlsyA/WpM6ik44iSqfA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "lua-types": "^2.13.1", + "typescript-to-lua": "^1.10.0" + } + }, "node_modules/typescript": { "version": "5.9.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", @@ -3621,7 +3632,7 @@ "@types/delaunator": "5.0.3", "@types/pako": "2.0.4", "@types/pathfinding": "0.1.0", - "typed-factorio": "3.30.1" + "typed-factorio": "3.31.0" } }, "packages/editor/node_modules/ajv": { @@ -3646,17 +3657,6 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "license": "MIT" }, - "packages/editor/node_modules/typed-factorio": { - "version": "3.30.1", - "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-3.30.1.tgz", - "integrity": "sha512-HNXZHxi/MaUWNqxC/LMGg9Hpcq27fX2iQJridOiSQwjIBeC8jQjt+k+MeGLD4K6BBwwATh2g7Fly9V1T3cOZMg==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "lua-types": "^2.13.1", - "typescript-to-lua": "^1.10.0" - } - }, "packages/website": { "name": "@fbe/website", "version": "1.0.0", diff --git a/packages/editor/package.json b/packages/editor/package.json index e2747a0b..e5543dee 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -25,6 +25,6 @@ "@types/delaunator": "5.0.3", "@types/pako": "2.0.4", "@types/pathfinding": "0.1.0", - "typed-factorio": "3.30.1" + "typed-factorio": "3.31.0" } } diff --git a/packages/editor/src/UI/controls/functions.ts b/packages/editor/src/UI/controls/functions.ts index 29710445..f90851e0 100644 --- a/packages/editor/src/UI/controls/functions.ts +++ b/packages/editor/src/UI/controls/functions.ts @@ -311,8 +311,7 @@ function CreateRecipe( nextX += timeSize.width + 6 for (const r of results) { - const name = r.type === 'research-progress' ? r.research_item : r.name - CreateIconWithAmount(host, nextX, y, name, r.amount) + CreateIconWithAmount(host, nextX, y, r.name, r.amount) nextX += 36 } } diff --git a/packages/exporter/src/main.rs b/packages/exporter/src/main.rs index 0f6b8d8d..00f39133 100644 --- a/packages/exporter/src/main.rs +++ b/packages/exporter/src/main.rs @@ -10,7 +10,7 @@ mod setup; #[macro_use] extern crate lazy_static; -static FACTORIO_VERSION: &str = "2.0.66"; +static FACTORIO_VERSION: &str = "2.0.68"; lazy_static! { static ref DATA_DIR: PathBuf = PathBuf::from("./data"); diff --git a/tsconfig.json b/tsconfig.json index 10cf78c5..ee2783b0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,6 @@ "@fbe/*": ["./packages/*/src/index.ts"] }, - "types": ["vite/client", "./packages/editor/node_modules/typed-factorio/prototype"] + "types": ["vite/client", "typed-factorio/prototype"] } }