From 6305db7ad617d0c140bc591d0f3a981355e0d145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sat, 24 May 2025 12:28:57 -0500 Subject: [PATCH] feat: update to correct branch --- .vscode/settings.json | 5 +++++ packages/scripts/src/applyPatches.ts | 2 +- packages/scripts/src/protos.ts | 2 +- submodules/blitzkit-closed | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index e8f7348f4..a6bba98af 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,6 +33,7 @@ "blitzkit", "blitzrinth", "blitzstars", + "bufbuild", "cacheable", "Callouts", "Camo", @@ -75,6 +76,7 @@ "dxgi", "echarts", "Everytime", + "FABLEGEAR", "FASTNAME", "flexdirection", "FOURCC", @@ -108,6 +110,7 @@ "Maddoxkkm", "malum", "mantlets", + "MECHA", "metallicness", "metalness", "minitelrose", @@ -145,6 +148,7 @@ "POSITIVEY", "POSITIVEZ", "precompute", + "PROGRESSTON", "Promisable", "proto", "protobuf", @@ -204,6 +208,7 @@ "vitepress", "Vovko", "wargaming", + "WARHAMMER", "webp", "whitespaces", "WHSS", diff --git a/packages/scripts/src/applyPatches.ts b/packages/scripts/src/applyPatches.ts index e2b3d2641..9dd1c950b 100644 --- a/packages/scripts/src/applyPatches.ts +++ b/packages/scripts/src/applyPatches.ts @@ -3,7 +3,7 @@ import { mkdir, writeFile } from 'fs/promises'; import { parse as parsePath } from 'path'; import ProgressBar from 'progress'; import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'; -import { dvp } from '../../../submodules/blitzkit-closed/src/dvp'; +import { dvp } from '../../../submodules/blitzkit-closed/src/dava/dvp'; import { readStringDVPL } from '../src/core/blitz/readStringDVPL'; import { DATA } from './buildAssets/constants'; import { readYAMLDVPL } from './core/blitz/readYAMLDVPL'; diff --git a/packages/scripts/src/protos.ts b/packages/scripts/src/protos.ts index 1b7a0ac2e..0f1546e57 100644 --- a/packages/scripts/src/protos.ts +++ b/packages/scripts/src/protos.ts @@ -15,7 +15,7 @@ if (existsSync('node_modules/.bin/protoc-gen-ts_proto.exe')) { } await compile('packages/core/src/protos'); -await compile('submodules/blitzkit-closed/src/unreal/protos'); +await compile('submodules/blitzkit-closed/src/protos'); async function compile(root: string) { const filesRaw = await readdir(root); diff --git a/submodules/blitzkit-closed b/submodules/blitzkit-closed index 2c64f3da9..89d753647 160000 --- a/submodules/blitzkit-closed +++ b/submodules/blitzkit-closed @@ -1 +1 @@ -Subproject commit 2c64f3da9c4eacec53bb67ff3a23cad9bf3ee8ff +Subproject commit 89d753647816052763a9bd577f65c2d67dfe5b51