themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed merge conflict

Browse source
This commit is contained in:
Maverick Motherfucker 2011-05-30 00:21:58 -07:00
commit 3b27d58536
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -41,4 +41,6 @@ Thumbs.db
*.suo *.suo
*.sdf *.sdf
*.opensdf *.opensdf
*.csproj.user *.csproj.user
*.cache
*.txt

5
TShockAPI/TShock.cs
View file

@ -14,6 +14,11 @@ namespace TShockAPI
{ {
public static string saveDir = "./tshock/"; public static string saveDir = "./tshock/";
public override Version Version
{
get { return new Version(0, 1); }
}
public override string Name public override string Name
{ {
get { return "TShock"; } get { return "TShock"; }

1
TShockAPI/TShockAPI.csproj
View file

@ -32,6 +32,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" /> <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />