Dandellion
/
Neo-Poseidon
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Fixes rust requiring newer version and malformed state.json

See merge request Dandellion/Neo-Poseidon!1
This commit is contained in:
Daniel Løvbrøtte Olsen 2019-01-27 12:32:33 +00:00
parent 89e146e83d fb32d3737c
commit e185aec7f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell.nix
View File

@ -1,7 +1,7 @@
let let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; }; nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
rustNightlyChannel = (nixpkgs.rustChannelOf { date = "2019-01-07"; channel = "nightly"; }).rust; rustNightlyChannel = (nixpkgs.rustChannelOf { date = "2019-01-26"; channel = "nightly"; }).rust;
rustStableChannel = nixpkgs.latest.rustChannels.stable.rust.override { rustStableChannel = nixpkgs.latest.rustChannels.stable.rust.override {
extensions = [ extensions = [
"rust-src" "rust-src"
@ -17,4 +17,4 @@ with nixpkgs;
buildInputs = [ buildInputs = [
rustNightlyChannel rustNightlyChannel
]; ];
} }

2
static/state.json
View File

@ -60,7 +60,7 @@
"race_picture": "images/Cybkatte.png", "race_picture": "images/Cybkatte.png",
"race_bio": null "race_bio": null
}, },
"color": "#0000FF" "color": "#0000FF",
"tech": { "tech": {
"weapons": { "weapons": {
"level": 1, "level": 1,