Merge remote-tracking branch 'origin/master' into blending-equations

# Conflicts:
#	osu-framework
This commit is contained in:
smoogipooo
2017-09-11 02:42:23 +09:00
56 changed files with 822 additions and 252 deletions

View File

@ -93,8 +93,6 @@ namespace osu.Game.Rulesets.Catch
}
}
public override Mod GetAutoplayMod() => new ModAutoplay();
public override string Description => "osu!catch";
public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_fruits_o };