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

Merge branch 'general-devel' of https://github.com/nyxstudios/TShock into general-devel

Browse source
This commit is contained in:
White 2015-07-10 18:35:49 +09:30
commit d171af4b09
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/ConfigFile.cs
View file

@ -290,7 +290,7 @@ namespace TShockAPI
public bool AllowLoginAnyUsername = true;
[Description("The maximum damage a player/npc can inflict.")]
public int MaxDamage = 175;
public int MaxDamage = 1175;
[Description("The maximum damage a projectile can inflict.")]
public int MaxProjDamage = 1175;

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.3.1")]
[assembly: AssemblyFileVersion("4.3.1")]
[assembly: AssemblyVersion("4.3.2")]
[assembly: AssemblyFileVersion("4.3.2")]