Merge remote-tracking branch 'upstream/develop' into develop

amethyst · Sep 7, 2016 · 266819c · 266819c
2 parents a47a146 + 204a6bb
commit 266819c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ adheres to [Semantic Versioning][sv].
 
 [sv]: http://semver.org/
 
+## 0.3.1 (2016-09-07)
+
+### Fixed
+* Fixed broken API reference link in `README.md`
+* amethyst.rs book: link to API reference broken (issue [#86])
+* Master branch no longer builds on beta/nightly Rust (issue [#94])
+
+[#86]: https://github.com/amethyst/amethyst/issues/86
+[#94]: https://github.com/amethyst/amethyst/issues/94
+
 ## 0.3.0 (2016-03-31)
 
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "amethyst"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Eyal Kalderon <ebkalderon@gmail.com>"]
 description = "Data-oriented game engine written in Rust"
 keywords = ["game", "engine", "sdk", "amethyst"]
@@ -14,11 +14,11 @@ license = "MIT"
 
 [dependencies.amethyst_ecs]
 path = "src/ecs/"
-version = "0.1.0"
+version = "0.1.1"
 
 [dependencies.amethyst_renderer]
 path = "src/renderer/"
-version = "0.3.0"
+version = "0.3.1"
 
 [dependencies.amethyst_config]
 path = "src/config/"

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Build Status][s1]][tc] [![Crates.io][s2]][ci] [![MIT License][s3]][ml] [![Join the chat][s4]][gc]
 
 [s1]: https://travis-ci.org/amethyst/amethyst.svg?branch=master
-[s2]: https://img.shields.io/badge/crates.io-0.3.0-orange.svg
+[s2]: https://img.shields.io/badge/crates.io-0.3.1-orange.svg
 [s3]: https://img.shields.io/badge/license-MIT-blue.svg
 [s4]: https://badges.gitter.im/amethyst/general.svg
 
@@ -63,7 +63,7 @@ Read the [online book][bk] for a comprehensive tutorial to using Amethyst. There
 is also an online crate-level [API reference][ar].
 
 [bk]: https://www.amethyst.rs/book/
-[ar]: https://www.amethyst.rs/doc/
+[ar]: https://www.amethyst.rs/doc/master/amethyst/
 
 ## Quick Example
 

diff --git a/book/src/intro.md b/book/src/intro.md
@@ -38,7 +38,7 @@ This book is split into seven sections. This page is the first. The others are:
 
 Read the crate-level [API documentation][ad] for more details.
 
-[ad]: https://www.amethyst.rs/doc/amethyst/
+[ad]: https://www.amethyst.rs/doc/master/amethyst/
 
 ## Why are you building this?
 

diff --git a/src/ecs/Cargo.toml b/src/ecs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "amethyst_ecs"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Eyal Kalderon <ebkalderon@gmail.com>"]
 description = "Entity component system (ECS) library"
 keywords = ["entity", "component", "system", "game", "amethyst"]

diff --git a/src/renderer/Cargo.toml b/src/renderer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "amethyst_renderer"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Eyal Kalderon <ebkalderon@gmail.com>"]
 description = "High-level rendering engine with multiple backends"
 keywords = ["game", "engine", "renderer", "3d", "amethyst"]

diff --git a/src/renderer/README.md b/src/renderer/README.md
@@ -2,8 +2,8 @@
 
 [![Build Status][s1]][tc] [![Crates.io][s2]][ci] [![MIT License][s3]][ml] [![Join the chat][s4]][gc]
 
-[s1]: https://api.travis-ci.org/amethyst/amethyst.svg
-[s2]: https://img.shields.io/badge/crates.io-0.3.0-orange.svg
+[s1]: https://api.travis-ci.org/ebkalderon/amethyst.svg
+[s2]: https://img.shields.io/badge/crates.io-0.3.1-orange.svg
 [s3]: https://img.shields.io/badge/license-MIT-blue.svg
 [s4]: https://badges.gitter.im/amethyst/amethyst.svg