drewcassidy/ReStocked
1
0
Fork 0
mirror of https://github.com/PorktoberRevolution/ReStocked synced 2024-06-11 05:54:07 +00:00
Code Issues Releases Wiki Activity

Fix merge error with dll and csproj

Browse Source
This commit is contained in:
Andrew Cassidy 2021-01-15 16:55:19 -08:00
parent 97b3101ed2
commit a0f70bd778
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
View File

Binary file not shown.

2
Source/Restock/Restock.csproj
View File

@ -57,6 +57,8 @@
<Compile Include="MaterialModifiers\TexturePropertyMaterialModifier.cs" /> <Compile Include="MaterialModifiers\TexturePropertyMaterialModifier.cs" />
<Compile Include="ModuleRestockDeployableMeshHider.cs" /> <Compile Include="ModuleRestockDeployableMeshHider.cs" />
<Compile Include="ModuleRestockLaunchClamp.cs" /> <Compile Include="ModuleRestockLaunchClamp.cs" />
<Compile Include="ModuleRestockEnhancedLight.cs" />
<Compile Include="ModuleRestockRCSGlow.cs" />
<Compile Include="ModuleRestockLinkedMesh.cs" /> <Compile Include="ModuleRestockLinkedMesh.cs" />
<Compile Include="ModuleRestockDepthMask.cs" /> <Compile Include="ModuleRestockDepthMask.cs" />
<Compile Include="ModuleRestockHeatEffects.cs" /> <Compile Include="ModuleRestockHeatEffects.cs" />