Skip to content

Commit

Permalink
Merge pull request #41 from Nytra/main
Browse files Browse the repository at this point in the history
Update for Type Management
  • Loading branch information
Xlinka authored Jul 12, 2024
2 parents 09f5737 + 84d16df commit 54fc756
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ProjectObsidian/Components/Utility/StringToTypeDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected override void OnChanges()
{
try
{
var parsedType = WorkerManager.ParseNiceType(Text.Value);
var parsedType = World.Types.ParseNiceType(Text.Value, allowAmbigious: true);
Target.Target.Value = parsedType;
}
catch (Exception ex)
Expand Down
6 changes: 6 additions & 0 deletions ProjectObsidian/ProjectObsidian.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<ResonitePath Condition="Exists('G:\SteamLibrary\steamapps\common\Resonite\')">G:\SteamLibrary\steamapps\common\Resonite\</ResonitePath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Compile Remove="ProtoFlux\Bindings\Networking\**" />
<EmbeddedResource Remove="ProtoFlux\Bindings\Networking\**" />
Expand Down
28 changes: 28 additions & 0 deletions ProjectObsidian/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

using Elements.Core;

[assembly: System.Reflection.AssemblyCompanyAttribute("Project-Obsidian")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © 2024")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+09f5737d6929d0dd439b34f23667465a4105bc78")]
[assembly: System.Reflection.AssemblyProductAttribute("Project-Obsidian")]
[assembly: System.Reflection.AssemblyTitleAttribute("Project-Obsidian")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

//Mark as DataModelAssembly for the Plugin loading system to load this assembly
[assembly: DataModelAssembly(DataModelAssemblyType.Core)]

0 comments on commit 54fc756

Please sign in to comment.