Merge branch 'master' of git://github.com/nesco/MCServer.

MCServer/items.ini

@@ -119,10 +119,18 @@ redwool=35:14
 blackwool=35:15
 dandelion=37
 
-; Obsolete, use "dandelion" instead (kept for compatibility, will be removed)
+; Renamed in 1.7, use "poppy" instead; kept for compatibility reasons, will be removed later on.
-flower=37
-
 rose=38
+
+flower=38
+poppy=38
+blueorchid=38:1
+allium=38:2
+redtulip=38:4
+orangetulip=38:5
+whitetulip=38:6
+pinktulip=38:7
+oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
 gold=41

source/Mobs/Giant.cpp

@@ -8,9 +8,9 @@
 
 
 cGiant::cGiant(void) :
-	// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here
+	super("Giant", mtGiant, "mob.zombie.hurt", "mob.zombie.death", 3.6, 10.8)
-	super("Giant", mtGiant, "mob.zombie.hurt", "mob.zombie.death", 2.0, 13.5)
 {
+
 }