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

Resolved merge conflicts on sundial-permission

Browse source
This commit is contained in:
White 2016-07-28 11:20:37 +09:30
commit b2bd40b8f2
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Permissions.cs
View file

@ -275,6 +275,9 @@ namespace TShockAPI
[Description("User can set the time.")]
public static readonly string time = "tshock.world.time.set";
[Description("Player can use the Enchanted Sundial item.")]
public static readonly string usesundial = "tshock.world.time.usesundial";
[Description("User can grow plants.")]
public static readonly string grow = "tshock.world.grow";
@ -329,6 +332,9 @@ namespace TShockAPI
[Description("User can modify the wind.")]
public static readonly string wind = "tshock.world.wind";
[Description("Player can toggle party event.")]
public static readonly string toggleparty = "tshock.world.toggleparty";
// Non-grouped
[Description("User can clear items or projectiles.")]
@ -378,10 +384,6 @@ namespace TShockAPI
[Description("Player can place banned tiles.")]
public static readonly string canusebannedtiles = "tshock.tiles.usebanned";
[Description("Player can toggle party event.")]
public static readonly string toggleparty = "tshock.world.toggleparty";
/// <summary>
/// Lists all commands associated with a given permission
/// </summary>