Skip to content

Commit

Permalink
Merge branch '18.02' into add_tih
Browse files Browse the repository at this point in the history
  • Loading branch information
TREE-Ind authored Jun 18, 2018
2 parents 86bbb3f + 9694238 commit 58c31a6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@
[submodule "zork"]
path = game-zork
url = https://github.com/forslund/white-house-adventure.git
[submodule "mycroft-person-detect-skill"]
path = mycroft-person-detect-skill
url = https://github.com/patilaum/mycroft-person-detect-skill.git
[submodule "deej-score"]
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
Expand All @@ -136,3 +142,6 @@
[submodule "today-history.btotharye"]
path = today-history.btotharye
url = https://github.com/Geeked-Out-Solutions/mycroft-skill-today-in-history
[submodule "krunner-search-skill"]
path = krunner-search-skill
url = https://github.com/AIIX/krunner-search-skill
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,12 @@ wiki pages. Also please include the phrase to trigger on as well for your skill
| ------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
| :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: | [Krunner Search Skill](https://github.com/AIIX/krunner-search-skill/blob/master/README.md)| Search KDE Plasma locally for files, applications, documents etc<br>```search this computer for 'Your Filename/Application/Etc'``` |
| :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"``` |
| :heavy_check_mark: | [Plasma Activities Skill](https://github.com/AIIX/plasma-activities-skill#readme)| Control KDE Plasma 5 Activities with Mycroft```show/create/switch/remove activity [name]``` |
| :heavy_check_mark: | [Today In History Skill](https://github.com/Geeked-Out-Solutions/mycroft-skill-today-in-history#readme)| Gives a random event from today in history```today in history``` |
| :heavy_check_mark: | [translate-skill](https://github.com/jcasoft/translate-skill/tree/84db4da986c1ae165d4c31bb5f907398feb19326#readme) | Translate phrases into several languages<br>```"translate good morning into japanese"``` |
| :heavy_check_mark: | [translate-skill](https://github.com/jcasoft/translate-skill/tree/84db4da986c1ae165d4c31bb5f907398feb19326#readme) | Translate phrases into several languages<br>```"translate good morning into japanese"``` |
| :heavy_check_mark: | [Zork](https://github.com/forslund/white-house-adventure/blob/master/README.md)| Play the old school adventure game<br>```and explore the underground empire``` |
| :heavy_check_mark: | [Score](https://github.com/deejcunningham/skill-score/blob/master/README.md)| Reports latest MLB scores<br>```what is the Royals score``` |

| :heavy_check_mark: | [person-detector](https://github.com/patilaum/mycroft-person-detect-skill/README.md)| detects persons in front of webcam<br>```how many persons in front of you```|
1 change: 1 addition & 0 deletions krunner-search-skill
Submodule krunner-search-skill added at 0371b5

0 comments on commit 58c31a6

Please sign in to comment.