From 324f11481069a11f1da5524fdc397597ac50a73a Mon Sep 17 00:00:00 2001
From: Christoffer Sundbom <christoffer_karlsson@live.se>
Date: Sun, 17 Nov 2024 10:30:28 +0100
Subject: [PATCH 1/3] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b7bb8f7d7b9..3cb4251c4765 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Godot Engine
+# Merlin Engine
 
 <p align="center">
   <a href="https://godotengine.org">
@@ -6,9 +6,9 @@
   </a>
 </p>
 
-## 2D and 3D cross-platform game engine
+## Merlin Egnine is a super experimental fork, i only take in all the new and interesting stuff!
 
-**[Godot Engine](https://godotengine.org) is a feature-packed, cross-platform
+**[Merlin / Godot Engine](https://godotengine.org) is a feature-packed, cross-platform
 game engine to create 2D and 3D games from a unified interface.** It provides a
 comprehensive set of [common tools](https://godotengine.org/features), so that
 users can focus on making games without having to reinvent the wheel. Games can

From 0cf468aa73aad970cb20a66a1e46642797180d90 Mon Sep 17 00:00:00 2001
From: Christoffer Sundbom <christoffer_karlsson@live.se>
Date: Fri, 22 Nov 2024 20:39:13 +0100
Subject: [PATCH 2/3] fixed font check for my fonts

---
 tests/scene/test_fontfile.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/scene/test_fontfile.h b/tests/scene/test_fontfile.h
index 8c9ba6d6ff51..ffca6f62805a 100644
--- a/tests/scene/test_fontfile.h
+++ b/tests/scene/test_fontfile.h
@@ -54,11 +54,11 @@ TEST_CASE("[FontFile] Create font file and check data") {
 	ERR_PRINT_ON
 
 	// Load a valid file.
-	CHECK(font_file->load_dynamic_font("thirdparty/fonts/NotoSans_Regular.woff2") == OK);
+	CHECK(font_file->load_dynamic_font("thirdparty/fonts/Inter_Regular.woff2") == OK);
 
 	// Check fontfile data.
 	CHECK_MESSAGE(font_file->get_data().is_empty() == false, "Fontfile should have been loaded.");
-	CHECK_MESSAGE(font_file->get_font_name() == "Noto Sans", "Loaded correct font name.");
+	CHECK_MESSAGE(font_file->get_font_name() == "Inter", "Loaded correct font name.");
 	CHECK_MESSAGE(font_file->get_font_style_name() == "Regular", "Loaded correct font style.");
 	CHECK_MESSAGE(font_file->get_data().size() == 148480llu, "Whole fontfile was loaded.");
 

From fafb81c487198ef31b43848c9933311fe2af297a Mon Sep 17 00:00:00 2001
From: Christoffer Sundbom <christoffer_karlsson@live.se>
Date: Fri, 22 Nov 2024 20:48:49 +0100
Subject: [PATCH 3/3] fixed the font size check

---
 tests/scene/test_fontfile.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scene/test_fontfile.h b/tests/scene/test_fontfile.h
index ffca6f62805a..d390001a012d 100644
--- a/tests/scene/test_fontfile.h
+++ b/tests/scene/test_fontfile.h
@@ -60,7 +60,7 @@ TEST_CASE("[FontFile] Create font file and check data") {
 	CHECK_MESSAGE(font_file->get_data().is_empty() == false, "Fontfile should have been loaded.");
 	CHECK_MESSAGE(font_file->get_font_name() == "Inter", "Loaded correct font name.");
 	CHECK_MESSAGE(font_file->get_font_style_name() == "Regular", "Loaded correct font style.");
-	CHECK_MESSAGE(font_file->get_data().size() == 148480llu, "Whole fontfile was loaded.");
+	CHECK_MESSAGE(font_file->get_data().size() == 108488llu, "Whole fontfile was loaded.");
 
 	// Valid glyphs.
 	CHECK_MESSAGE(font_file->get_glyph_index(2, 'a', 0) != 0, "Glyph index for 'a' is valid.");