Merge branch 'unstable'

mki1967 · Jun 27, 2018 · 9780629 · 9780629
2 parents ad6ef9c + 605518c
commit 9780629
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,11 +5,12 @@ addons:
     - xorg-dev
 language: go
 go:
-  - 1.6
+  - "1.6"
+  - "1.10" 
 install:
   - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
 script:
   - go get -t -v ./...
   - diff -u <(echo -n) <(gofmt -d -s .)
   - go tool vet .
-  - go test -v -race ./...
+  - go test -v -race ./...
diff --git a/assets/stages/electro-snail-stage.mki3d b/assets/stages/electro-snail-stage.mki3d
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mki3dgame-snap # you probably want to 'snapcraft register <name>'
-version: '1.12' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.13' # just for humans, typically '1.2+git' or '1.3.2'
 summary: A game of finding tokens in 3D stages among the flying monsters. # 79 char long summary
 description: |
   Find and collect tokens in 3D stages and avoid being captured by the monsters.

diff --git a/usr/share/metainfo/io.github.mki1967.mki3dgame.appdata.xml b/usr/share/metainfo/io.github.mki1967.mki3dgame.appdata.xml
@@ -13,7 +13,7 @@
     </p>
     <p>
       The stages, monsters and tokens are
-      designned with MKI3D RAPID MODELLER.
+      designed with MKI3D RAPID MODELLER.
     </p>
   </description>
   <url type="homepage">https://mki1967.github.io/mki3dgame</url>
@@ -33,6 +33,11 @@
     <binary>io.github.mki1967.mki3dgame</binary>
   </provides>
   <releases>
+    <release version="1.13" date="2018-06-27">
+      <description>
+	<p>new stage: electro-snail-stage</p>
+      </description>
+    </release>
     <release version="1.12" date="2018-03-05">
       <description>
 	<p>fancy random coloured sky-box</p>