mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 11:57:10 +00:00
Code Issues Projects Releases Wiki Activity

Final merging changes

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2012-12-29 16:14:59 +01:00
parent aa7d6b12b5
commit f1956464b0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/Data.class.php
View File

@ -81,7 +81,7 @@ class Material{
); );
static $unbreakable = array( static $unbreakable = array(
0 => true, 0 => true,
//7 => true, 7 => true,
8 => true, 8 => true,
9 => true, 9 => true,
10 => true, 10 => true,

6
src/common/config.php
View File

@ -40,8 +40,4 @@ define("CURRENT_VERSION", 1);
define("LOG", true); define("LOG", true);
define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78");
define("TEST_MD5", "5ca8eced50a5801619f7ae86d631a4e7"); define("TEST_MD5", "5ca8eced50a5801619f7ae86d631a4e7");
<<<<<<< HEAD define("MAJOR_VERSION", "Alpha_1.0.2");
define("MAJOR_VERSION", "Alpha_1.0.2");
=======
define("MAJOR_VERSION", "Alpha_1.1");
>>>>>>> Changed version to next release