Merge branch '2.0' into 1.9
This commit is contained in:
		@@ -13,7 +13,7 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class PruneCommands : NadekoSubmodule<PruneService>
 | 
					        public class PruneCommands : NadekoSubmodule<PruneService>
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            private readonly TimeSpan twoWeeks = TimeSpan.FromDays(14);
 | 
					            private static readonly TimeSpan twoWeeks = TimeSpan.FromDays(14);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            //delets her own messages, no perm required
 | 
					            //delets her own messages, no perm required
 | 
				
			||||||
            [NadekoCommand, Usage, Description, Aliases]
 | 
					            [NadekoCommand, Usage, Description, Aliases]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,10 +20,10 @@ namespace NadekoBot.Modules.Gambling
 | 
				
			|||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class DriceRollCommands : NadekoSubmodule
 | 
					        public class DriceRollCommands : NadekoSubmodule
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            private readonly Regex dndRegex  = new Regex(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$", RegexOptions.Compiled);
 | 
					            private static readonly Regex dndRegex  = new Regex(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$", RegexOptions.Compiled);
 | 
				
			||||||
            private readonly Regex fudgeRegex  = new Regex(@"^(?<n1>\d+)d(?:F|f)$", RegexOptions.Compiled);
 | 
					            private static readonly Regex fudgeRegex  = new Regex(@"^(?<n1>\d+)d(?:F|f)$", RegexOptions.Compiled);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            private readonly char[] _fateRolls = { '-', ' ', '+' };
 | 
					            private static readonly char[] _fateRolls = { '-', ' ', '+' };
 | 
				
			||||||
            private readonly IImagesService _images;
 | 
					            private readonly IImagesService _images;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            public DriceRollCommands(IImagesService images)
 | 
					            public DriceRollCommands(IImagesService images)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user