Merge remote-tracking branch 'origin/release-1.7' into release-1.8

Conflicts:
	build.properties
	release.sh

.travis.yml

@@ -17,20 +17,20 @@ deploy:
     script: ./gradlew curse -S
     on:
       all_branches: true
-      repo: rubensworks/EvilCraft
+      repo: CyclopsMC/EvilCraft
       tags: true
   - provider: releases
     skip_cleanup: true
     api_key:
       secure: A+23PDJUKg1CU28NmXw/YG7qmGDIrys1GuyuDuodK2AjBjT191GJWyr6mB0VV0uWo+/3H6FhDQNCLvKZ+0aphLRPMfLlNb4pBw31l7PFsJjsqF3/5BXNqXwCxxEWPLWAI85Pbt9bQX8BlTrQXeFast49opb0kWAlE3hh4E3yr1M=
     on:
       all_branches: true
-      repo: rubensworks/EvilCraft
+      repo: CyclopsMC/EvilCraft
       tags: true
   - provider: script
     skip_cleanup: true
     script: ./gradlew uploadArchives -S
     on:
       all_branches: true
-      repo: rubensworks/EvilCraft
+      repo: CyclopsMC/EvilCraft
       condition: "$TRAVIS_BRANCH =~ ^(master|release).*$"

release.sh

@@ -12,21 +12,22 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
 RELEASE=1
 export RELEASE
 
-./gradlew build
-./gradlew uploadArchives
-./gradlew curse
+#./gradlew build
+#./gradlew uploadArchives
+#./gradlew curse
 
 # Github release
 minecraft_version=$(grep minecraft_version= build.properties | sed s/minecraft_version=//)
 tag=$(grep mod_version= build.properties | sed s/mod_version=//)
 name="EvilCraft-"$minecraft_version"-"$tag
 changelog=$(cat changelog.txt)
-printf '{"tag_name": "%s","target_commitish": "master","name": "%s","body": "%s","draft": false,"prerelease": false}' $tag $name "Changelog can be found at: http://minecraft.curseforge.com/mc-mods/74610-evilcraft/files" > .tmp.json
+printf '{"tag_name": "%s","target_commitish": "master-1.7","name": "%s","body": "%s","draft": false,"prerelease": false}' $tag $name "Changelog can be found at: http://minecraft.curseforge.com/mc-mods/74610-evilcraft/files" > .tmp.json
 ACCESS_TOKEN=$(grep github_token= gradle.properties | sed s/github_token=//)
 
-creationresp=$(curl [email protected] https://api.github.com/repos/rubensworks/EvilCraft/releases?access_token=$ACCESS_TOKEN)
+creationresp=$(curl [email protected] https://api.github.com/repos/CyclopsMC/EvilCraft/releases?access_token=$ACCESS_TOKEN)
+echo $creationresp
 RELEASEID=$(echo $creationresp | jsonval "id")
-echo $RELEASEID
-curl -H "Authorization: token $ACCESS_TOKEN" -H "Content-Type: application/zip" --data-binary @build/libs/$name.jar https://uploads.github.com/repos/rubensworks/EvilCraft/releases/$RELEASEID/assets?name=$name.jar
+echo "Release: $RELEASEID"
+curl -H "Authorization: token $ACCESS_TOKEN" -H "Content-Type: application/zip" --data-binary @build/libs/$name.jar https://api.github.com/repos/CyclopsMC/EvilCraft/releases/$RELEASEID/?name=$name.jar
 
-rm .tmp.json
+rm .tmp.json

resources/changelog/1.7.10-0.8.9.txt

@@ -0,0 +1,10 @@
+As always, don't forget to backup your world before updating!
+
+Changes:
+* Add toggle button to choose Exalted Crafter return target inv. Closes #225 This allows players to choose between the inner inventory or the player inventory to send items to when shift-clicking them from the crafting grid.
+* Add blacklist for repairable Blood Chest items. Closes #240 Add new entries to the list S:bloodInfuser.itemBlacklist by item name in the config file.
+* Improve efficiency of recipes using oredict items. Closes #241
+
+Fixes:
+* Fix typo what caused part of the book not to be loaded. Fix #238
+* Fix missing Thaumcraft aspects