mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-24 12:09:51 +02:00
Merge branch 'main' into dev
This commit is contained in:
commit
baaae612fd
3 files changed
+4
-4
No files matched your search
@@ -62,7 +62,7 @@ export async function consumableProvisionIcons() {
|
|||||||
.replace(".psd", "")
|
.replace(".psd", "")
|
||||||
.replace(".txt", "");
|
.replace(".txt", "");
|
||||||
|
|
||||||
if (vfs.has(`Data/${configPath}.packed.webp`)) {
|
if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
|
||||||
const image = sharp(
|
const image = sharp(
|
||||||
await vfs.file(`Data/${configPath}.packed.webp`)
|
await vfs.file(`Data/${configPath}.packed.webp`)
|
||||||
);
|
);
|
||||||
@@ -131,7 +131,7 @@ export async function consumableProvisionIcons() {
|
|||||||
.replace(".psd", "")
|
.replace(".psd", "")
|
||||||
.replace(".txt", "");
|
.replace(".txt", "");
|
||||||
|
|
||||||
if (vfs.has(`Data/${configPath}.packed.webp`)) {
|
if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
|
||||||
const image = sharp(
|
const image = sharp(
|
||||||
await vfs.file(`Data/${configPath}.packed.webp`)
|
await vfs.file(`Data/${configPath}.packed.webp`)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { vfs } from "../../../buildAssets/constants";
|
|||||||
|
|
||||||
export async function readTexture(path: string) {
|
export async function readTexture(path: string) {
|
||||||
const ddsTexturePath = path.replace(".tex", ".dx11.dds");
|
const ddsTexturePath = path.replace(".tex", ".dx11.dds");
|
||||||
const isDds = vfs.has(ddsTexturePath);
|
const isDds = vfs.resolve(ddsTexturePath);
|
||||||
const resolvedTexturePath = isDds
|
const resolvedTexturePath = isDds
|
||||||
? ddsTexturePath
|
? ddsTexturePath
|
||||||
: ddsTexturePath.replace(".dds", ".pvr");
|
: ddsTexturePath.replace(".dds", ".pvr");
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export class AssetUploader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (diff.status === DiffStatus.Unchanged) {
|
if (diff.status === DiffStatus.Unchanged) {
|
||||||
console.log(`🔵 ${change.path}`);
|
// console.log(`🔵 ${change.path}`);
|
||||||
} else {
|
} else {
|
||||||
console.log(
|
console.log(
|
||||||
`${diff.status === DiffStatus.New ? "🟢" : "🟡"} (${
|
`${diff.status === DiffStatus.New ? "🟢" : "🟡"} (${
|
||||||
|
|||||||
Reference in new issue
Block a user