Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Thorium-Sim/thorium
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderson1993 committed Jul 12, 2019
2 parents c0164e0 + e953e82 commit 35c99dd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [1.17.1](https://github.com/Thorium-Sim/thorium/compare/1.17.0...1.17.1) (2019-07-10)


### Bug Fixes

* **Hide Card:** Fixes some possible problems with hiding cards. Closes [#2409](https://github.com/Thorium-Sim/thorium/issues/2409) ([e246a12](https://github.com/Thorium-Sim/thorium/commit/e246a12))
* **Macros:** Fixes an issue where updating viewscreen macros crashes. Closes [#2419](https://github.com/Thorium-Sim/thorium/issues/2419). Closes [#2412](https://github.com/Thorium-Sim/thorium/issues/2412) ([e648f95](https://github.com/Thorium-Sim/thorium/commit/e648f95))
* **Tactical Map:** Improves the animation of the tactical map. Closes [#2415](https://github.com/Thorium-Sim/thorium/issues/2415). Closes [#2416](https://github.com/Thorium-Sim/thorium/issues/2416). ([7876d82](https://github.com/Thorium-Sim/thorium/commit/7876d82))

# [1.17.0](https://github.com/Thorium-Sim/thorium/compare/1.16.0...1.17.0) (2019-07-06)


Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thorium-client",
"version": "1.17.0",
"version": "1.17.1",
"description": "Starship Simulator Controls built with React",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thorium",
"version": "1.17.0",
"version": "1.17.1",
"description": "Starship Simulator Controls",
"private": true,
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thorium-server",
"version": "1.17.0",
"version": "1.17.1",
"description": "Starship Simulator Controls Server, built with GraphQL",
"private": true,
"repository": {
Expand Down

0 comments on commit 35c99dd

Please sign in to comment.