Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 16 insertions, 0 deletions

diff --git a/Minecraft.World/HtmlString.h b/Minecraft.World/HtmlString.h
new file mode 100644
index 00000000..16108073
--- /dev/null
+++ b/Minecraft.World/HtmlString.h
@@ -0,0 +1,16 @@
+#pragma once
+
+// 4J: Simple string wrapper that includes basic formatting information
+class HtmlString
+{
+public:
+	wstring text; // Text content of string
+	eMinecraftColour color; // Hex color
+	bool italics; // Show text in italics
+	bool indent; // Indent text
+
+	HtmlString(wstring text, eMinecraftColour color = eMinecraftColour_NOT_SET, bool italics = false, bool indent = false);
+	wstring ToString();
+
+	static wstring Compose(vector<HtmlString> *strings);
+};
\ No newline at end of file