Merge remote-tracking branch 'origin/master'

Conflicts: GameData/RP-0/CostHacks.cfg
KSP-RO · Nov 17, 2014 · 2b9d0bd · 2b9d0bd
2 parents 35a8a3c + 5242387
commit 2b9d0bd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,17 @@
 language: c
 
-script:
-    make
+install:
+    - sudo apt-get install zip
+
+script: make release
+
+deploy:
+  provider: releases
+  api_key:
+    secure: sB3nXTDnZgr4o1Wk7NZaQZNTyfknolA7rJ90TqwSx1/kvg0Xc6/7CBAVqtndW0ivkF0CV8AT32Jc3tGPBdfArMGcljFuiHyuYFEUmA2qcIDNcdUD+hdF1Jq5HKjUiEuqTf012s1fi9WyNwsZSBSxSckwP6K9y1huxpYPLRYuQ9Q=
+  file_glob: true
+  file: RP-0-*.zip
+  on:
+    repo: KSP-RO/RP-0
+    tags: true
+    all_branches: true
diff --git a/Makefile b/Makefile
@@ -18,4 +18,4 @@ $(TREE): $(TREE_SRC)
 	bin/yml2mm
 
 $(ZIPFILE): $(TREE)
-	zip -r $(ZIPFILE) GameData
+	zip -r $(ZIPFILE) README.md LICENSE.md GameData
diff --git a/README.md b/README.md
@@ -3,3 +3,4 @@ Welcome to Realistic Progression Zero, the lightweight tech-tree for Kerbal Spac
 License: CC-BY-4.0
 
 Forum thread: http://forum.kerbalspaceprogram.com/threads/99010
+Github Repo:  https://gihub.com/KSP-RO/RP-0
diff --git a/RP-0.ckan b/RP-0.ckan
@@ -17,5 +17,10 @@
         { "name" : "SXT" },
         { "name" : "ProceduralFairings" },
         { "name" : "CommunityTechTree" }
+    ],
+    "recommends" : [
+        { "name" : "ProceduralDyanmics" },
+        { "name" : "TweakScale" },
+        { "name" : "ProceduralParts" }
     ]
 }