Skip to content

Commit 7648ab4

Browse files
1zun41zun4
committed
Merge remote-tracking branch 'upstream/main'
2 parents 8db6319 + 40e2a08 commit 7648ab4

34 files changed

Lines changed: 157 additions & 2031 deletions

‎bundle.cjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ if (fs.existsSync("resources")) {
1010
log("Deleted resources folder");
1111
}
1212

13-
fs.mkdirSync("resources/resources/liquidbounce", { recursive: true });
13+
fs.mkdirSync("resources/resources/liquidbounce/themes", { recursive: true });
1414

1515
// Create a zip archive
16-
const output = fs.createWriteStream("resources/resources/liquidbounce/default_theme.zip");
16+
const output = fs.createWriteStream("resources/resources/liquidbounce/themes/liquidbounce.zip");
1717
const archive = archiver("zip", {});
1818

1919
output.on("close", () => {

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<title>LiquidBounce UI</title>
8-
<link rel="preload" href="./src/assets/font/Minecraft.otf" as="font" crossorigin="anonymous">
8+
<link rel="preload" href="/fonts/Minecraft.otf" as="font" crossorigin="anonymous">
99
</head>
1010

1111
<body>

public/background.frag renamed to public/backgrounds/background.frag

File renamed without changes.

public/background.png renamed to public/backgrounds/background.png

File renamed without changes.

‎public/components/arraylist.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "ArrayList",
3+
"enabled": true,
4+
"singleton": true,
5+
"alignment": {
6+
"horizontalAlignment": "Left",
7+
"horizontalOffset": 0,
8+
"verticalAlignment": "Top",
9+
"verticalOffset": 0
10+
}
11+
}

‎public/components/watermark.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "Watermark",
3+
"enabled": true,
4+
"singleton": true,
5+
"alignment": {
6+
"horizontalAlignment": "Left",
7+
"horizontalOffset": 0,
8+
"verticalAlignment": "Top",
9+
"verticalOffset": 0
10+
}
11+
}

src/assets/font/Minecraft.otf renamed to public/fonts/Minecraft.otf

File renamed without changes.

0 commit comments

Comments
 (0)