From ec8408fa914b1218ef5bcd125ef45cd683e54790 Mon Sep 17 00:00:00 2001
From: Joelant05 <Joelant05@users.noreply.github.com>
Date: Mon, 15 Feb 2021 21:03:17 +0000
Subject: [PATCH 1/3] fix: lang files not being created properly

---
 data/preset/entity/bee/manifest.json                     | 2 +-
 .../Windows/Project/CreatePreset/CreatePreset.ts         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/preset/entity/bee/manifest.json b/data/preset/entity/bee/manifest.json
index b00f2e804..50246bbea 100644
--- a/data/preset/entity/bee/manifest.json
+++ b/data/preset/entity/bee/manifest.json
@@ -67,7 +67,7 @@
 		],
 		[
 			"textureNectar.png",
-			"RP/textures/entity/{{IDENTIFIER}}.png",
+			"RP/textures/entity/{{IDENTIFIER}}_nectar.png",
 			{ "inject": ["IDENTIFIER"] }
 		]
 	],
diff --git a/src/components/Windows/Project/CreatePreset/CreatePreset.ts b/src/components/Windows/Project/CreatePreset/CreatePreset.ts
index 880d23d13..67fcf4c0e 100644
--- a/src/components/Windows/Project/CreatePreset/CreatePreset.ts
+++ b/src/components/Windows/Project/CreatePreset/CreatePreset.ts
@@ -229,19 +229,18 @@ export class CreatePresetWindow extends BaseWindow {
 
 					let destFileText: string
 					try {
-						destFileText = this.transformString(
-							await (await fs.readFile(fullDestPath)).text(),
-							inject
-						)
+						destFileText = await (await fs.readFile(fullDestPath)).text()
 					} catch {
 						destFileText = ''
 					}
 
+					const outputFileText = this.transformString(fileText, inject)
+
 					await fs.writeFile(
 						fullDestPath,
 						`${destFileText}${
 							destFileText !== '' ? '\n' : ''
-						}${fileText}`
+						}${outputFileText}`
 					)
 				}
 			})

From de617028632f9b487e416fb4bd2370485a5ea909 Mon Sep 17 00:00:00 2001
From: solvedDev <solvedDev@gmail.com>
Date: Mon, 15 Feb 2021 23:01:00 +0100
Subject: [PATCH 2/3] fix: infinite loading spinner upon creating first project

---
 .../Projects/CreateProject/CreateProject.vue     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Projects/CreateProject/CreateProject.vue b/src/components/Projects/CreateProject/CreateProject.vue
index ee23ac55a..78488a939 100644
--- a/src/components/Projects/CreateProject/CreateProject.vue
+++ b/src/components/Projects/CreateProject/CreateProject.vue
@@ -108,9 +108,7 @@
 			<v-btn
 				color="primary"
 				:disabled="!currentWindow.hasRequiredData"
-				:loading="
-					isCreatingProject || !isCompilerReady || !isPackIndexerReady
-				"
+				:loading="shouldLoad"
 				@click="createProject"
 			>
 				<v-icon class="pr-2">mdi-plus</v-icon>
@@ -139,6 +137,18 @@ export default {
 	data() {
 		return this.currentWindow
 	},
+	computed: {
+		shouldLoad() {
+			// If this is the first project, only show a spinner while creating the spinner
+			if (this.isFirstProject) return this.isCreatingProject
+			// Otherwise check that the compiler & pack indexer are done too
+			return (
+				this.isCreatingProject ||
+				!this.isCompilerReady ||
+				!this.isPackIndexerReady
+			)
+		},
+	},
 	methods: {
 		close() {
 			this.currentWindow.close()

From 774cb9e05a6adbe29b0896e3fd18bc4cae38829e Mon Sep 17 00:00:00 2001
From: solvedDev <solvedDev@gmail.com>
Date: Mon, 15 Feb 2021 23:02:06 +0100
Subject: [PATCH 3/3] v2.0.0-alpha.4

---
 package.json        | 2 +-
 src/appVersion.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 90ba46c6f..0cbf38f2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bridge",
-	"version": "2.0.0-alpha.3",
+	"version": "2.0.0-alpha.4",
 	"private": true,
 	"scripts": {
 		"build:data": "node ./scripts/build.mjs",
diff --git a/src/appVersion.json b/src/appVersion.json
index 3153eb380..8a21ea4fa 100644
--- a/src/appVersion.json
+++ b/src/appVersion.json
@@ -1,3 +1,3 @@
 {
-	"version": "2.0.0-alpha.3"
+	"version": "2.0.0-alpha.4"
 }