Skip to content

Commit

Permalink
Merge branch 'xMAC94x/release_number' into 'master'
Browse files Browse the repository at this point in the history
release 0.6.0

See merge request veloren/airshipper!22
  • Loading branch information
xMAC94x committed Aug 31, 2021
2 parents 7578608 + de2021b commit 75f37ba
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Fixed

## [0.6.0] - 2021-08-31

## Added
- select the airshipper backend server between production/staging/test
- add a new settings window to adjust values and start veloren with trace level

## Changed
- update iced

## [0.5.0] - 2021-07-13

## Added
Expand Down Expand Up @@ -122,7 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Added GUI

[unreleased]: https://github.com/veloren/Airshipper/compare/v0.4.2...master
[unreleased]: https://github.com/veloren/Airshipper/compare/v0.6.0...master
[0.2.1]: https://github.com/veloren/Airshipper/releases/tag/v0.2.1
[0.2.0]: https://github.com/veloren/Airshipper/releases/tag/v0.2.0
[0.3.0]: https://github.com/veloren/Airshipper/releases/tag/v0.3.0
Expand All @@ -131,4 +140,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.4.0]: https://github.com/veloren/Airshipper/releases/tag/v0.4.0
[0.4.1]: https://github.com/veloren/Airshipper/releases/tag/v0.4.1
[0.4.2]: https://github.com/veloren/Airshipper/releases/tag/v0.4.2
[0.5.0]: https://github.com/veloren/Airshipper/releases/tag/v0.5.0
[0.5.0]: https://github.com/veloren/Airshipper/releases/tag/v0.5.0
[0.5.0]: https://github.com/veloren/Airshipper/releases/tag/v0.6.0
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "airshipper"
description = "Provides automatic updates for the voxel RPG Veloren."
version = "0.5.0"
version = "0.6.0"
authors = ["Songtronix <[email protected]>"]
edition = "2018"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion client/assets/net.veloren.airshipper.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</content_rating>

<releases>
<release version="0.5.0" date="2021-07-13"/>
<release version="0.6.0" date="2021-08-31"/>
</releases>

<description>
Expand Down
2 changes: 1 addition & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ reorder_impl_items = false
fn_single_line = false
inline_attribute_width = 0
match_block_trailing_comma = true
merge_imports = true
imports_granularity = "Crate"
overflow_delimited_expr = true
use_field_init_shorthand = true
max_width = 90
Expand Down
2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "airshipper-server"
version = "0.5.0"
version = "0.6.0"
authors = ["Songtronix <[email protected]>"]
edition = "2018"
publish = false
Expand Down

0 comments on commit 75f37ba

Please sign in to comment.