From 8fa4f38202d20b9f7ebf49943354aa0da1070f87 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Thu, 14 Nov 2013 23:15:19 +0100
Subject: Update Giant.cpp

---
 source/Mobs/Giant.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/Mobs/Giant.cpp b/source/Mobs/Giant.cpp
index f41977535..c0ad3d0a6 100644
--- a/source/Mobs/Giant.cpp
+++ b/source/Mobs/Giant.cpp
@@ -1,4 +1,3 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Giant.h"
@@ -8,9 +7,10 @@
 
 
 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", 2.0, 13.5)
+	// 6.0 * (0.6|1.8)
+	super("Giant", mtGiant, "mob.zombie.hurt", "mob.zombie.death", 3.6, 10.8)
 {
+	this->SetMaxHealth(100);
 }
 
 
-- 
cgit v1.2.3


From c868d31377149ca0e01610deecfb85f56bde0b64 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Fri, 15 Nov 2013 14:06:58 +0100
Subject: Update Giant.cpp

---
 source/Mobs/Giant.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Mobs/Giant.cpp b/source/Mobs/Giant.cpp
index c0ad3d0a6..44ee58e92 100644
--- a/source/Mobs/Giant.cpp
+++ b/source/Mobs/Giant.cpp
@@ -10,7 +10,7 @@ cGiant::cGiant(void) :
 	// 6.0 * (0.6|1.8)
 	super("Giant", mtGiant, "mob.zombie.hurt", "mob.zombie.death", 3.6, 10.8)
 {
-	this->SetMaxHealth(100);
+
 }
 
 
-- 
cgit v1.2.3


From d3269f37fa3e582dc6cd82c296e6997d196ebab8 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Fri, 15 Nov 2013 14:18:53 +0100
Subject: Update items.ini

---
 MCServer/items.ini | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 7eb8f56b4..bc19467a7 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -118,7 +118,21 @@ dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
 dandelion=37
-flower=38
+
+; Obsolete, use "dandelion" instead (kept for compatibility, will be removed)
+flower=37
+
+; Obselete, use a specific flower name instead
+rose=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
-- 
cgit v1.2.3


From 416292a82456a850692fcbf67373d8124f503d5e Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Sun, 17 Nov 2013 17:41:58 +0100
Subject: Blank Line added

---
 source/Mobs/Giant.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/Mobs/Giant.cpp b/source/Mobs/Giant.cpp
index 44ee58e92..66e5bbb01 100644
--- a/source/Mobs/Giant.cpp
+++ b/source/Mobs/Giant.cpp
@@ -1,3 +1,4 @@
+
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Giant.h"
-- 
cgit v1.2.3


From 44385fba28d68f9ea416d88b0f14b8d72aa8d2a7 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Mon, 18 Nov 2013 16:55:30 +0100
Subject: flower=38

---
 MCServer/items.ini | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/MCServer/items.ini b/MCServer/items.ini
index bc19467a7..42ab22fa3 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -119,12 +119,10 @@ redwool=35:14
 blackwool=35:15
 dandelion=37
 
-; Obsolete, use "dandelion" instead (kept for compatibility, will be removed)
-flower=37
-
-; Obselete, use a specific flower name instead
+; Obselete, use a specific flower name instead (or flower)
 rose=38
 
+flower=38
 poppy=38
 blueorchid=38:1
 allium=38:2
-- 
cgit v1.2.3