Merge branch 'general-devel' of github.com:TShock/TShock into general-devel
This commit is contained in:
Zack Piispanen
commit
bb5f431954
6 changed files with 6 additions and 139 deletions
68
TShockAPI/Resources.Designer.cs
generated
68
TShockAPI/Resources.Designer.cs
generated
|
|
@ -1,25 +1,7 @@
|
|||
/*
|
||||
TShock, a server mod for Terraria
|
||||
Copyright (C) 2011-2013 Nyx Studios (fka. The TShock Team)
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.235
|
||||
// Runtime Version:4.0.30319.17929
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
@ -27,6 +9,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace TShockAPI {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
|
|
@ -74,48 +59,5 @@ namespace TShockAPI {
|
|||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to #Format
|
||||
///#name parent permisson1 permission2 permissionN
|
||||
///#if there is no parent, put null instead
|
||||
///#groups inherit permissions from their parents
|
||||
///#put a ! before a permission to negate it
|
||||
///#Do not remove the group default
|
||||
///#Do not name a group SuperAdmin, that is hard-coded into the code, it grants total permissions
|
||||
///#ALWAYS DECLARE A GROUP'S PARENT BEFORE YOU DECLARE THE GROUP
|
||||
///
|
||||
///#currently avaliable permissions:
|
||||
///#reservedslot - reserved slot for player
|
||||
///#canwater - allow players to use water
|
||||
///#canlav [rest of string was truncated]";.
|
||||
/// </summary>
|
||||
internal static string groups {
|
||||
get {
|
||||
return ResourceManager.GetString("groups", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to #see https://github.com/TShock/TShock/wiki/Item-List for a list of item ids
|
||||
///#List each banned item ID below this, with each on a new line.
|
||||
/// </summary>
|
||||
internal static string itembans {
|
||||
get {
|
||||
return ResourceManager.GetString("itembans", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to #format
|
||||
///#ip group
|
||||
///#see groups.txt for a list of groups
|
||||
///#127.0.0.1 superadmin.
|
||||
/// </summary>
|
||||
internal static string users {
|
||||
get {
|
||||
return ResourceManager.GetString("users", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,13 +118,4 @@
|
|||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="groups" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>config\groups.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
|
||||
</data>
|
||||
<data name="itembans" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>config\itembans.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
|
||||
</data>
|
||||
<data name="users" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>config\users.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -133,12 +133,8 @@
|
|||
<Compile Include="DB\WarpsManager.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="config\groups.txt" />
|
||||
<None Include="TShockAPI.licenseheader" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="config\users.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
|
|
@ -168,9 +164,6 @@
|
|||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="config\itembans.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -183,7 +176,7 @@
|
|||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
|
||||
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
#Format
|
||||
#name parent permisson1 permission2 permissionN
|
||||
#if there is no parent, put null instead
|
||||
#groups inherit permissions from their parents
|
||||
#put a ! before a permission to negate it
|
||||
#Do not remove the group default
|
||||
#Do not name a group SuperAdmin, that is hard-coded into the code, it grants total permissions
|
||||
#ALWAYS DECLARE A GROUP'S PARENT BEFORE YOU DECLARE THE GROUP
|
||||
|
||||
#currently avaliable permissions:
|
||||
#reservedslot - reserved slot for player
|
||||
#canwater - allow players to use water
|
||||
#canlava - allow players to use lava
|
||||
#canspike - allow players to place spikes
|
||||
#warp - allow players to use warps
|
||||
#kick - kick users
|
||||
#ban - ban players by name or ip
|
||||
#unban - unban players by name or ip
|
||||
#whitelist - add ip to whitelist
|
||||
#maintenance - check for updates/turn off server
|
||||
#causeevents - allow player to drop star/meteor and start invasion/bloodmoon
|
||||
#spawnboss - allow player to spawn bosses
|
||||
#spawnmob - allow player to spawn any npcs
|
||||
#tp - allow player to teleport
|
||||
#tphere - allow a player to teleport players to their position
|
||||
#managewarp - allow player to add/delete warp locations
|
||||
#managegroup - allow player to add/delete/modify groups
|
||||
#manageitem - allow a player to add/delete item bans
|
||||
#manageregion - allow a user to create/edit regions
|
||||
#editspawn - allow player to enable/disable build protection
|
||||
#cfg - allow player to view/change tshock configuration
|
||||
#time - allow player to change time
|
||||
#pvpfun - enable pvpfun commands
|
||||
#logs - notify player when any command is executed
|
||||
#kill - allow player to kill others
|
||||
#butcher - allow player to kill all alive monsters
|
||||
#item - allow player to spawn items
|
||||
#heal - allow player to heal
|
||||
#immunetokick - player can't be kick
|
||||
#immunetoban - player can't be banned
|
||||
#ignorecheatdetection - allow player to cheat (health/mana cheats)
|
||||
#ignoregriefdetection - allow player to grief (use explosives, water, lava even if they dont have premission to)
|
||||
#usebanneditem - allows player to use banned items
|
||||
#manageusers - Grab player info
|
||||
#whisper - allow player to whisper to other players
|
||||
#adminchat - Colors and adds a prefix to the player's chats.
|
||||
#canbuild - allow player to build (does not bypass other checks)
|
||||
|
||||
default null canwater canlava warp canbuild
|
||||
vip default reservedslot
|
||||
newadmin default kick editspawn reservedslot
|
||||
admin newadmin ban unban whitelist causeevents spawnboss spawnmob managewarp time tp pvpfun kill logs immunetokick tphere
|
||||
trustedadmin admin maintenance cfg butcher cheat immunetoban ignorecheatdetection ignoregriefdetection usebanneditem
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#see https://github.com/TShock/TShock/wiki/Item-List for a list of item ids
|
||||
#List each banned item ID below this, with each on a new line
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#format
|
||||
#ip group
|
||||
#see groups.txt for a list of groups
|
||||
#127.0.0.1 superadmin
|
||||
Loading…
Add table
Add a link
Reference in a new issue