Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
WeAthFolD committed Jul 6, 2016
2 parents bca0c02 + bd38f4a commit 8d185d5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![](https://raw.githubusercontent.com/LambdaInnovation/AcademyCraft/master/blob/logo.png)

[![Build Status](http://jenkins.mcbox.cc/job/LambdaInnovation/job/AcademyCraft/badge/icon)](http://jenkins.mcbox.cc/job/LambdaInnovation/job/AcademyCraft/)
[![Build Status](http://jenkins.mcbox.cc/job/AcademyCraft/badge/icon)](http://jenkins.mcbox.cc/job/AcademyCraft/)

A Minecraft mod about superability, including its aquiring, upgrading and using. The inspiration of AcademyCraft comes from [A Certain Scientific Railgun (とある科学の超電磁砲)](https://en.wikipedia.org/wiki/A_Certain_Scientific_Railgun) but the mod content is not limited of the background.

Expand Down Expand Up @@ -66,4 +66,4 @@ that's really everything.

[langdir]: src/main/resources/assets/academy/lang
[tutdir]: src/main/resources/assets/academy/tutorials
[lambdalib]: https://github.com/LambdaInnovation/LambdaLib
[lambdalib]: https://github.com/LambdaInnovation/LambdaLib

0 comments on commit 8d185d5

Please sign in to comment.