Merge pull request #14 from CleverRaven/master

Update #14

CMakeLists.txt

@@ -31,7 +31,7 @@ set(PREFIX           "" CACHE STRING "Location of Data & GFX directories")
 include(CTest)
 
 include(GetGitRevisionDescription)
-git_describe(GIT_VERSION)
+git_describe(GIT_VERSION --tags --always --match "[0-9A-Z]*.[0-9A-Z]*")
 
 MESSAGE("\n * Cataclysm: Dark Days Ahead is a turn-based survival game set in a post-apocalyptic world.")
 MESSAGE("   _________            __                   .__                                ")

build-scripts/validate_pr_in_jenkins

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -z "$ghprbPullId" ]; then exit 0; fi
 

data/core/basic.json

@@ -12,8 +12,8 @@
     "category": "food",
     "name": { "str_sp": "water" },
     "description": "Water, the stuff of life, the best thirst-quencher available.  It would be safer to drink once purified.",
-    "weight": 250,
-    "volume": 1,
+    "weight": "250 g",
+    "volume": "250 ml",
     "price": 50,
     "symbol": "~",
     "color": "light_blue",