Merge remote-tracking branch 'origin/master' into cleanups

* origin/master: Added travis build-status indicator. *whistles innocently* Just fixing travis notifications. Have travis ping IRC when things break (or get better) Fix typo Change separatron cost to $7000 Conflicts: tree.yml
KSP-RO · Nov 22, 2014 · 0745ce8 · 0745ce8
2 parents 1cfc82b + 4390742
commit 0745ce8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,3 +15,12 @@ deploy:
     repo: KSP-RO/RP-0
     tags: true
     all_branches: true
+
+notifications:
+    irc: 
+        channels:
+            - "irc.esper.net#rp0"
+        on_success: change
+        on_failure: always
+        use_notice: true
+        skip_join: true
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/KSP-RO/RP-0.svg?branch=master)](https://travis-ci.org/KSP-RO/RP-0)
+
 Welcome to Realistic Progression Zero, the lightweight tech-tree for Kerbal Space Program's Realism Overhaul.
 
 License: CC-BY-NC-SA-4.0

diff --git a/tree.yml b/tree.yml
@@ -138,6 +138,7 @@ start:
     # Engines
 
     sepMotor1:
+        cost: 7
 
     # Small solid
     SnubOtron: