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

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

1 files changed, 9 insertions, 4 deletions

diff --git a/Minecraft.World/Language.h b/Minecraft.World/Language.h
index 10e2951f..9c7c8524 100644
--- a/Minecraft.World/Language.h
+++ b/Minecraft.World/Language.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 class Language
 {
 private:
@@ -7,8 +9,11 @@ private:
 public:
 	Language();
     static Language *getInstance();
-    wstring getElement(const wstring& elementId, ...);
-	wstring getElement(const wstring& elementId, va_list args);
-    wstring getElementName(const wstring& elementId);
-    wstring getElementDescription(const wstring& elementId);
+    template<typename...Args>
+    inline std::wstring getElement(const std::wstring& elementId, Args...)
+    {
+        return elementId;
+    }
+    std::wstring getElementName(const std::wstring& elementId);
+    std::wstring getElementDescription(const std::wstring& elementId);
 };
\ No newline at end of file