Merge remote-tracking branch 'origin/develop' into develop

2019-06-18 02:11:58 -04:00
parent d54d839ab5 4eee13a359
commit 8c91e52a8a
11 changed files with 78 additions and 16 deletions
@@ -429,6 +429,7 @@ public class ObjectBuilderFactory
 		manager.Register(LocCommands.Stub("charactereditname"), new CommandCharacterEditName(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("charactereditURL"), new CommandCharacterEditURL(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("leaderboard"), new CommandLeaderboard(KittyRole.General, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("color, colour"), new CommandColor(KittyRole.General, KittyRating.Safe));
 		
 		return manager;
 	}