From d0a4943776b6d9bc024aecc8470f67e7133d3afa Mon Sep 17 00:00:00 2001 From: Brant Martin Date: Thu, 14 Apr 2016 11:56:14 -0400 Subject: [PATCH] Version bump, scan tweak --- EssentialsPlugin/AssemblyFileVersion.cs | 6 +-- EssentialsPlugin/AssemblyFileVersion.tt | 4 +- EssentialsPlugin/EssentialsPlugin.csproj | 2 +- .../Properties/Resources.Designer.cs | 39 ++++++++----------- .../Properties/Settings.Designer.cs | 2 +- EssentialsPlugin/Utility/CubeGrid.cs | 2 +- 6 files changed, 25 insertions(+), 30 deletions(-) diff --git a/EssentialsPlugin/AssemblyFileVersion.cs b/EssentialsPlugin/AssemblyFileVersion.cs index 2c842e0..6c1a735 100644 --- a/EssentialsPlugin/AssemblyFileVersion.cs +++ b/EssentialsPlugin/AssemblyFileVersion.cs @@ -1,4 +1,4 @@ -//350 +//1 // // This code was generated by a tool. Any changes made manually will be lost // the next time this code is regenerated. @@ -6,5 +6,5 @@ using System.Reflection; -[assembly: AssemblyFileVersion("1.13.5.350")] -[assembly: AssemblyVersion("1.13.5.350")] +[assembly: AssemblyFileVersion("1.13.6.1")] +[assembly: AssemblyVersion("1.13.6.1")] diff --git a/EssentialsPlugin/AssemblyFileVersion.tt b/EssentialsPlugin/AssemblyFileVersion.tt index 6b2572e..1656ed4 100644 --- a/EssentialsPlugin/AssemblyFileVersion.tt +++ b/EssentialsPlugin/AssemblyFileVersion.tt @@ -29,5 +29,5 @@ using System.Reflection; -[assembly: AssemblyFileVersion("1.13.5.<#= revisionNumber #>")] -[assembly: AssemblyVersion("1.13.5.<#= revisionNumber #>")] +[assembly: AssemblyFileVersion("1.13.6.<#= revisionNumber #>")] +[assembly: AssemblyVersion("1.13.6.<#= revisionNumber #>")] diff --git a/EssentialsPlugin/EssentialsPlugin.csproj b/EssentialsPlugin/EssentialsPlugin.csproj index ab79bfe..040ae2d 100644 --- a/EssentialsPlugin/EssentialsPlugin.csproj +++ b/EssentialsPlugin/EssentialsPlugin.csproj @@ -9,7 +9,7 @@ Properties EssentialsPlugin Essentials - v4.5 + v4.6.1 512 diff --git a/EssentialsPlugin/Properties/Resources.Designer.cs b/EssentialsPlugin/Properties/Resources.Designer.cs index bd588b7..0b0ad67 100644 --- a/EssentialsPlugin/Properties/Resources.Designer.cs +++ b/EssentialsPlugin/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,42 +9,37 @@ //------------------------------------------------------------------------------ namespace EssentialsPlugin.Properties { - using System.CodeDom.Compiler; - using System.ComponentModel; - using System.Diagnostics; - using System.Diagnostics.CodeAnalysis; - using System.Globalization; - using System.Resources; - using System.Runtime.CompilerServices; - - /// + using System; + + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [DebuggerNonUserCode()] - [CompilerGenerated()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - private static ResourceManager resourceMan; + private static global::System.Resources.ResourceManager resourceMan; - private static CultureInfo resourceCulture; + private static global::System.Globalization.CultureInfo resourceCulture; - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// /// Returns the cached ResourceManager instance used by this class. /// - [EditorBrowsable(EditorBrowsableState.Advanced)] - internal static ResourceManager ResourceManager { + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { get { - if (ReferenceEquals(resourceMan, null)) { - ResourceManager temp = new ResourceManager("EssentialsPlugin.Properties.Resources", typeof(Resources).Assembly); + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EssentialsPlugin.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -55,8 +50,8 @@ internal static ResourceManager ResourceManager { /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// - [EditorBrowsable(EditorBrowsableState.Advanced)] - internal static CultureInfo Culture { + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } diff --git a/EssentialsPlugin/Properties/Settings.Designer.cs b/EssentialsPlugin/Properties/Settings.Designer.cs index 6eccc75..95981b8 100644 --- a/EssentialsPlugin/Properties/Settings.Designer.cs +++ b/EssentialsPlugin/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace EssentialsPlugin.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/EssentialsPlugin/Utility/CubeGrid.cs b/EssentialsPlugin/Utility/CubeGrid.cs index d1514bd..781e5c6 100644 --- a/EssentialsPlugin/Utility/CubeGrid.cs +++ b/EssentialsPlugin/Utility/CubeGrid.cs @@ -476,7 +476,7 @@ public static HashSet ScanGrids( ulong userId, string[] words ) int blockCountLess = 0; bool testStatic = false; MyCubeSize blockSize = MyCubeSize.Large; - GridLinkTypeEnum connectionType = GridLinkTypeEnum.Physical; + GridLinkTypeEnum connectionType = GridLinkTypeEnum.Logical; if (words.Any( )) {