From f1956464b047573fc520f846915369892e23122b Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Sat, 29 Dec 2012 16:14:59 +0100 Subject: [PATCH] Final merging changes --- src/classes/Data.class.php | 2 +- src/common/config.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/classes/Data.class.php b/src/classes/Data.class.php index 8ab8f494b7..ed9e25f2d6 100644 --- a/src/classes/Data.class.php +++ b/src/classes/Data.class.php @@ -81,7 +81,7 @@ class Material{ ); static $unbreakable = array( 0 => true, - //7 => true, + 7 => true, 8 => true, 9 => true, 10 => true, diff --git a/src/common/config.php b/src/common/config.php index 7623e8a8da..e9f53bd79f 100644 --- a/src/common/config.php +++ b/src/common/config.php @@ -40,8 +40,4 @@ define("CURRENT_VERSION", 1); define("LOG", true); define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("TEST_MD5", "5ca8eced50a5801619f7ae86d631a4e7"); -<<<<<<< HEAD -define("MAJOR_VERSION", "Alpha_1.0.2"); -======= -define("MAJOR_VERSION", "Alpha_1.1"); ->>>>>>> Changed version to next release +define("MAJOR_VERSION", "Alpha_1.0.2"); \ No newline at end of file