Skip to content

Commit

Permalink
Merge branch '18.02' into 18.02
Browse files Browse the repository at this point in the history
  • Loading branch information
patilaum authored Jun 18, 2018
2 parents ff77e49 + a3b7928 commit dc8c3d7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
15 changes: 12 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@
[submodule "translate-skill"]
path = translate-skill
url = https://github.com/jcasoft/translate-skill
[submodule "CaffeineWiz"]
path = CaffeineWiz
url = https://github.com/reginaneon/CaffeineWiz.git
[submodule "plasma-activities-skill"]
path = plasma-activities-skill
url = https://github.com/AIIX/plasma-activities-skill
Expand All @@ -136,3 +133,15 @@
path = deej-score
url = https://github.com/deejcunningham/skill-score

[submodule "reginaneon-caffeine-wiz"]
path = reginaneon-caffeine-wiz
url = https://github.com/reginaneon/CaffeineWiz.git
[submodule "reginaneon-av-music"]
path = reginaneon-av-music
url = https://github.com/reginaneon/AVmusic.git
[submodule "deej-score"]
path = deej-score
url = https://github.com/deejcunningham/skill-score.git
[submodule "tree-desktop-control"]
path = tree-desktop-control
url = https://github.com/TREE-Edu/desktop-control-skill.git
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The official home of skills for the Mycroft ecosystem. These skills are written
**[HTML version of this document](https://mycroftai.github.io/mycroft-skills)**

## Available Skills

| Skill Name | Description<br>"handled phrases" |
| ------------------------------------------------------------------------------| ---------------------------------------------------------------------|
| [AIML Fallback](https://github.com/forslund/fallback-aiml#readme) | AIML skill by JarbasAI |
Expand Down Expand Up @@ -144,6 +144,7 @@ wiki pages. Also please include the phrase to trigger on as well for your skill

| Status | Skill Name | Description<br>```"phrase to trigger"``` |
| ------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
| :heavy_check_mark: | [AVmusic](https://github.com/reginaneon/AVmusic/blob/master/README.md)| Provides the playback of any music/video requested by the user. No login required. <br>```play some imagine dragons music``` |
| :heavy_check_mark: | [CaffeineWiz](https://github.com/reginaneon/caffeinewiz.reginaneon/blob/master/README.md)| Request caffeine content of selected drinks<br>```what's the caffeine content of *drink*?```|
| :heavy_check_mark: | [mycroft-hue](https://github.com/ChristopherRogers1991/mycroft-hue/blob/master/README.md)| Control your Phillips Hue lights<br>```turn on the lights``` |
| :heavy_check_mark: | [Homeassistant](https://github.com/btotharye/mycroft-homeassistant#readme) | Control your devices in home-assistant<br>```"turn on office"``` |
Expand Down
1 change: 1 addition & 0 deletions reginaneon-av-music
Submodule reginaneon-av-music added at 4f8334
1 change: 1 addition & 0 deletions reginaneon-caffeine-wiz
1 change: 1 addition & 0 deletions tree-desktop-control
Submodule tree-desktop-control added at e3eaa3

0 comments on commit dc8c3d7

Please sign in to comment.