diff --git a/.editorconfig b/.editorconfig
index 4bebc53999..186026ff1f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,7 @@
-root = true
+root = true
[*]
-charset = utf-8-bom
+charset = utf-8
# Indentation and spacing
indent_size = 4
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index defdc00b0d..697faf5f75 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -33,6 +33,4 @@
OptionsMenu.cs
-
-
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index 7b3e097987..8cb670526f 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -25,6 +25,4 @@
-
-
diff --git a/RobustToolbox b/RobustToolbox
index 797fa9cffa..f048209bf5 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 797fa9cffa0d5da4741c3d3077466417a7420349
+Subproject commit f048209bf505c0299d02ccabc8d378500babc39b
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
index f92aeb592d..c9e65b467e 100644
--- a/SpaceStation14.sln
+++ b/SpaceStation14.sln
@@ -71,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustTool
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Physics", "RobustToolbox\Robust.Physics\Robust.Physics.csproj", "{3BC34700-882F-426B-82BB-56D5708B5E0D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,10 @@ Global
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -165,6 +171,7 @@ Global
{DDD55F86-0406-42E5-8443-93EDC6BB2D75} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
{3BC34700-882F-426B-82BB-56D5708B5E0D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
+ {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
diff --git a/Tools/package_release_build.py b/Tools/package_release_build.py
index ca5a1e65c5..e01dab6117 100755
--- a/Tools/package_release_build.py
+++ b/Tools/package_release_build.py
@@ -59,34 +59,6 @@ LAUNCHER_RESOURCES = {
"Fonts",
}
-WINDOWS_NATIVES = {
- "freetype6.dll",
- "openal32.dll",
- "swnfd.dll",
- "glfw3.dll",
- "fluidsynth.dll",
- "libglib-2.0-0.dll",
- "libgobject-2.0-0.dll",
- "libgthread-2.0-0.dll",
- "libinstpatch-2.dll",
- "libintl-8.dll",
- "libsndfile-1.dll",
- "libEGL.dll",
- "libGLESv2.dll"
-}
-
-LINUX_NATIVES = {
- "libglfw.so.3",
- "libswnfd.so",
- "libopenal.so.1"
-}
-
-MAC_NATIVES = {
- "libglfw.3.dylib",
- "libswnfd.dylib",
- "libfreetype.6.dylib"
-}
-
# Assembly names to copy from content.
# PDBs are included if available, .dll/.pdb appended automatically.
SERVER_CONTENT_ASSEMBLIES = [
@@ -191,7 +163,6 @@ def build_windows(skip_build: bool) -> None:
compression=zipfile.ZIP_DEFLATED)
copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "win-x64", "publish"), "", client_zip)
- copy_client_natives(WINDOWS_NATIVES, client_zip, "")
copy_resources("Resources", client_zip, server=False)
copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
# Cool we're done.
@@ -231,7 +202,6 @@ def build_macos(skip_build: bool) -> None:
contents = p("Space Station 14.app", "Contents", "Resources")
copy_dir_into_zip(p("BuildFiles", "Mac", "Space Station 14.app"), "Space Station 14.app", client_zip)
copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "osx-x64", "publish"), contents, client_zip)
- copy_client_natives(MAC_NATIVES, client_zip, contents)
copy_resources(p(contents, "Resources"), client_zip, server=False)
copy_content_assemblies(p(contents, "Resources", "Assemblies"), client_zip, server=False)
client_zip.close()
@@ -272,7 +242,6 @@ def build_linux(skip_build: bool) -> None:
copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "linux-x64", "publish"), "", client_zip)
copy_resources("Resources", client_zip, server=False)
- copy_client_natives(LINUX_NATIVES, client_zip, "")
copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
# Cool we're done.
client_zip.close()
@@ -446,11 +415,5 @@ def copy_dir_or_file(src: str, dst: str):
raise IOError("{} is neither file nor directory. Can't copy.".format(src))
-def copy_client_natives(fileNames: List[str], zipf: zipfile.ZipFile, zipPath: str):
- for fileName in fileNames:
- zipf.write(p("RobustToolbox", "bin", "Client", fileName), p(zipPath, fileName))
- print(f"writing native {fileName}")
-
-
if __name__ == '__main__':
main()