Merge branch 'main' into ue

packages/scripts/src/buildAssets/consumableProvisionIcons.ts

@@ -62,7 +62,7 @@ export async function consumableProvisionIcons() {
         .replace(".psd", "")
         .replace(".txt", "");
 
-      if (vfs.has(`Data/${configPath}.packed.webp`)) {
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
         const image = sharp(
           await vfs.file(`Data/${configPath}.packed.webp`)
         );
@@ -131,7 +131,7 @@ export async function consumableProvisionIcons() {
         .replace(".psd", "")
         .replace(".txt", "");
 
-      if (vfs.has(`Data/${configPath}.packed.webp`)) {
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
         const image = sharp(
           await vfs.file(`Data/${configPath}.packed.webp`)
         );

packages/scripts/src/core/blitz/readTexture/index.ts

@@ -3,7 +3,7 @@ import { vfs } from "../../../buildAssets/constants";
 
 export async function readTexture(path: string) {
   const ddsTexturePath = path.replace(".tex", ".dx11.dds");
-  const isDds = vfs.has(ddsTexturePath);
+  const isDds = vfs.resolve(ddsTexturePath);
   const resolvedTexturePath = isDds
     ? ddsTexturePath
     : ddsTexturePath.replace(".dds", ".pvr");

packages/scripts/src/core/github/assetUploader.ts

@@ -99,7 +99,7 @@ export class AssetUploader {
     }
 
     if (diff.status === DiffStatus.Unchanged) {
-      console.log(`🔵 ${change.path}`);
+      // console.log(`🔵 ${change.path}`);
     } else {
       console.log(
         `${diff.status === DiffStatus.New ? "🟢" : "🟡"} (${