diff --git a/GamecraftModdingAPI/GamecraftModdingAPI.csproj b/GamecraftModdingAPI/GamecraftModdingAPI.csproj
index 49a3a6a..8be57a7 100644
--- a/GamecraftModdingAPI/GamecraftModdingAPI.csproj
+++ b/GamecraftModdingAPI/GamecraftModdingAPI.csproj
@@ -22,8 +22,8 @@
-<<<<<<< HEAD
-
+
+
..\ref\Gamecraft_Data\Managed\IllusionInjector.dll
@@ -33,45 +33,6 @@
..\ref\Gamecraft_Data\Managed\IllusionPlugin.dll
..\..\ref\Gamecraft_Data\Managed\IllusionPlugin.dll
-
- ..\ref\Gamecraft_Data\Managed\JWT.dll
- ..\..\ref\Gamecraft_Data\Managed\JWT.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Unity.Burst.Unsafe.dll
- ..\..\ref\Gamecraft_Data\Managed\Unity.Burst.Unsafe.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Rewired_Core.dll
- ..\..\ref\Gamecraft_Data\Managed\Rewired_Core.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll
- ..\..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll
-
-
- ..\ref\Gamecraft_Data\Managed\mscorlib.dll
- ..\..\ref\Gamecraft_Data\Managed\mscorlib.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Accessibility.dll
- ..\..\ref\Gamecraft_Data\Managed\Accessibility.dll
-=======
-
-
-
-
-
-
-
- ..\ref\GamecraftPreview_Data\Managed\IllusionInjector.dll
- ..\..\ref\GamecraftPreview_Data\Managed\IllusionInjector.dll
-
-
- ..\ref\GamecraftPreview_Data\Managed\IllusionPlugin.dll
- ..\..\ref\GamecraftPreview_Data\Managed\IllusionPlugin.dll
->>>>>>> 50ebf4f... Fix build issues for latest Gamecraft preview version
-
..\ref\Gamecraft_Data\Managed\Analytics.dll
..\..\ref\Gamecraft_Data\Managed\Analytics.dll
@@ -88,13 +49,6 @@
..\ref\Gamecraft_Data\Managed\Authentication.dll
..\..\ref\Gamecraft_Data\Managed\Authentication.dll
-<<<<<<< HEAD
-
- ..\ref\Gamecraft_Data\Managed\BlockEntityFactory.dll
- ..\..\ref\Gamecraft_Data\Managed\BlockEntityFactory.dll
-
-=======
->>>>>>> 50ebf4f... Fix build issues for latest Gamecraft preview version
..\ref\Gamecraft_Data\Managed\Blocks.HUDFeedbackBlocks.dll
..\..\ref\Gamecraft_Data\Managed\Blocks.HUDFeedbackBlocks.dll
@@ -104,16 +58,16 @@
..\..\ref\Gamecraft_Data\Managed\CommandLine.dll
- ..\ref\GamecraftPreview_Data\Managed\CommandLineCompositionRoot.dll
- ..\..\ref\GamecraftPreview_Data\Managed\CommandLineCompositionRoot.dll
+ ..\ref\Gamecraft_Data\Managed\CommandLineCompositionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\CommandLineCompositionRoot.dll
- ..\ref\GamecraftPreview_Data\Managed\ConsoleBlockComposotionRoot.dll
- ..\..\ref\GamecraftPreview_Data\Managed\ConsoleBlockComposotionRoot.dll
+ ..\ref\Gamecraft_Data\Managed\ConsoleBlockComposotionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\ConsoleBlockComposotionRoot.dll
- ..\ref\GamecraftPreview_Data\Managed\ConsoleCommand.dll
- ..\..\ref\GamecraftPreview_Data\Managed\ConsoleCommand.dll
+ ..\ref\Gamecraft_Data\Managed\ConsoleCommand.dll
+ ..\..\ref\Gamecraft_Data\Managed\ConsoleCommand.dll
..\ref\Gamecraft_Data\Managed\DataLoader.dll
@@ -123,10 +77,6 @@
..\ref\Gamecraft_Data\Managed\DDNA.dll
..\..\ref\Gamecraft_Data\Managed\DDNA.dll
-
- ..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll
- ..\..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll
-
..\ref\Gamecraft_Data\Managed\FMOD.dll
..\..\ref\Gamecraft_Data\Managed\FMOD.dll
@@ -140,12 +90,12 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.AudioBlocks.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlockCompositionRoot.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlockCompositionRoot.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.BlockCompositionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockCompositionRoot.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlockEntityFactory.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlockEntityFactory.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.BlockEntityFactory.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockEntityFactory.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.ConsoleBlock.dll
@@ -156,8 +106,8 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DamagingSurfaceBlock.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.GenericPhysicsBlocks.dll
@@ -172,16 +122,16 @@
..\..\ref\Gamecraft_Data\Managed\GameCraft.Blocks.ProjectileBlock.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TimerBlock.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TimerBlock.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerability.dll
@@ -192,20 +142,20 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerabilityGui.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.Damage.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.Damage.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.Damage.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Damage.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Effects.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Effects.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.ExplosionFragments.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.ExplosionFragments.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.ExplosionFragments.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.ExplosionFragments.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.GraphicsSettings.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.GraphicsSettings.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.GraphicsSettings.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GraphicsSettings.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.ConsoleBlock.dll
@@ -236,12 +186,12 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.WorldSpaceGuis.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.InventoryTimeRunning.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.InventoryTimeRunning.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.InventoryTimeRunning.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.InventoryTimeRunning.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.JointBlocks.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.JointBlocks.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.JointBlocks.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.JointBlocks.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Music.dll
@@ -252,20 +202,20 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.PerformanceWarnings.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.PickupBlck.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.PickupBlck.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.PickupBlck.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupBlck.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.PickupsCommon.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.PickupsCommon.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.PickupsCommon.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupsCommon.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.PopupMessage.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.PopupMessage.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.PopupMessage.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PopupMessage.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.Projectiles.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.Projectiles.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.Projectiles.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Projectiles.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.dll
@@ -276,8 +226,8 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.Mockup.dll
- ..\ref\GamecraftPreview_Data\Managed\Gamecraft.VisualEffects.Decals.dll
- ..\..\ref\GamecraftPreview_Data\Managed\Gamecraft.VisualEffects.Decals.dll
+ ..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.Decals.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.Decals.dll
..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.dll
@@ -287,13 +237,6 @@
..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.dll
-<<<<<<< HEAD
-
- ..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Input.dll
- ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Input.dll
-
-=======
->>>>>>> 50ebf4f... Fix build issues for latest Gamecraft preview version
..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Mockup.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Mockup.dll
@@ -326,18 +269,6 @@
..\ref\Gamecraft_Data\Managed\MultiplayerTest.dll
..\..\ref\Gamecraft_Data\Managed\MultiplayerTest.dll
-
- ..\ref\Gamecraft_Data\Managed\netstandard.dll
- ..\..\ref\Gamecraft_Data\Managed\netstandard.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
- ..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
-
-
- ..\ref\Gamecraft_Data\Managed\Novell.Directory.Ldap.dll
- ..\..\ref\Gamecraft_Data\Managed\Novell.Directory.Ldap.dll
-
..\ref\Gamecraft_Data\Managed\RCX.ScreenshotTaker.dll
..\..\ref\Gamecraft_Data\Managed\RCX.ScreenshotTaker.dll
@@ -519,12 +450,12 @@
..\..\ref\Gamecraft_Data\Managed\RobocratX.SimulationCompositionRoot.dll
- ..\ref\GamecraftPreview_Data\Managed\SpawningPointCompositionRoot.dll
- ..\..\ref\GamecraftPreview_Data\Managed\SpawningPointCompositionRoot.dll
+ ..\ref\Gamecraft_Data\Managed\SpawningPointCompositionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\SpawningPointCompositionRoot.dll
- ..\ref\GamecraftPreview_Data\Managed\SpecializedDescriptors.dll
- ..\..\ref\GamecraftPreview_Data\Managed\SpecializedDescriptors.dll
+ ..\ref\Gamecraft_Data\Managed\SpecializedDescriptors.dll
+ ..\..\ref\Gamecraft_Data\Managed\SpecializedDescriptors.dll
..\ref\Gamecraft_Data\Managed\StringFormatter.dll
@@ -547,13 +478,41 @@
..\..\ref\Gamecraft_Data\Managed\Svelto.Tasks.dll
- ..\ref\GamecraftPreview_Data\Managed\UltimateDecals.dll
- ..\..\ref\GamecraftPreview_Data\Managed\UltimateDecals.dll
+ ..\ref\Gamecraft_Data\Managed\UltimateDecals.dll
+ ..\..\ref\Gamecraft_Data\Managed\UltimateDecals.dll
..\ref\Gamecraft_Data\Managed\Unity.Addressables.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Addressables.dll
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.Hybrid.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.Hybrid.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.Hybrid.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.Hybrid.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.Graph.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Graph.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Animation.Hybrid.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Hybrid.dll
+
..\ref\Gamecraft_Data\Managed\Unity.Build.SlimPlayerRuntime.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Build.SlimPlayerRuntime.dll
@@ -566,6 +525,10 @@
..\ref\Gamecraft_Data\Managed\Unity.Collections.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Collections.dll
+
+ ..\ref\Gamecraft_Data\Managed\Unity.DataFlowGraph.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.DataFlowGraph.dll
+
..\ref\Gamecraft_Data\Managed\Unity.Deformations.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Deformations.dll
@@ -594,6 +557,10 @@
..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.Hybrid.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.Hybrid.dll
+
+ ..\ref\Gamecraft_Data\Managed\Unity.MemoryProfiler.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.MemoryProfiler.dll
+
..\ref\Gamecraft_Data\Managed\Unity.Physics.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Physics.dll
@@ -678,6 +645,62 @@
..\ref\Gamecraft_Data\Managed\Unity.Transforms.Hybrid.dll
..\..\ref\Gamecraft_Data\Managed\Unity.Transforms.Hybrid.dll
+
+ ..\ref\Gamecraft_Data\Managed\Unity.VisualEffectGraph.Runtime.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.VisualEffectGraph.Runtime.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\UnityEngine.UI.dll
+ ..\..\ref\Gamecraft_Data\Managed\UnityEngine.UI.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\uREPL.dll
+ ..\..\ref\Gamecraft_Data\Managed\uREPL.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\VisualProfiler.dll
+ ..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Accessibility.dll
+ ..\..\ref\Gamecraft_Data\Managed\Accessibility.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll
+ ..\..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\JWT.dll
+ ..\..\ref\Gamecraft_Data\Managed\JWT.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\mscorlib.dll
+ ..\..\ref\Gamecraft_Data\Managed\mscorlib.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\netstandard.dll
+ ..\..\ref\Gamecraft_Data\Managed\netstandard.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
+ ..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Novell.Directory.Ldap.dll
+ ..\..\ref\Gamecraft_Data\Managed\Novell.Directory.Ldap.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Rewired_Core.dll
+ ..\..\ref\Gamecraft_Data\Managed\Rewired_Core.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll
+ ..\..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll
+
+
+ ..\ref\Gamecraft_Data\Managed\Unity.Burst.Unsafe.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Burst.Unsafe.dll
+
..\ref\Gamecraft_Data\Managed\UnityEngine.AccessibilityModule.dll
..\..\ref\Gamecraft_Data\Managed\UnityEngine.AccessibilityModule.dll
@@ -846,10 +869,6 @@
..\ref\Gamecraft_Data\Managed\UnityEngine.TLSModule.dll
..\..\ref\Gamecraft_Data\Managed\UnityEngine.TLSModule.dll
-
- ..\ref\Gamecraft_Data\Managed\UnityEngine.UI.dll
- ..\..\ref\Gamecraft_Data\Managed\UnityEngine.UI.dll
-
..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsModule.dll
..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsModule.dll
@@ -922,17 +941,6 @@
..\ref\Gamecraft_Data\Managed\UnityEngine.XRModule.dll
..\..\ref\Gamecraft_Data\Managed\UnityEngine.XRModule.dll
-<<<<<<< HEAD
-
- ..\ref\Gamecraft_Data\Managed\uREPL.dll
- ..\..\ref\Gamecraft_Data\Managed\uREPL.dll
-
-
- ..\ref\Gamecraft_Data\Managed\VisualProfiler.dll
- ..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll
-
-=======
->>>>>>> 50ebf4f... Fix build issues for latest Gamecraft preview version
-
+
\ No newline at end of file