From d0fd51ea9ddef09a63f5edd87f9d950f491d49e2 Mon Sep 17 00:00:00 2001
From: David Erbelding <daviderbelding@gmail.com>
Date: Sun, 13 Sep 2015 23:18:21 -0400
Subject: Fixed flint drop rates from 1/30 to 1/10 to match the wiki.

---
 src/Blocks/BlockGravel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockGravel.h b/src/Blocks/BlockGravel.h
index eb101efe9..7bd68a050 100644
--- a/src/Blocks/BlockGravel.h
+++ b/src/Blocks/BlockGravel.h
@@ -19,7 +19,7 @@ public:
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		cFastRandom Random;
-		if (Random.NextInt(30) == 0)
+		if (Random.NextInt(10) == 0)
 		{
 			a_Pickups.Add(E_ITEM_FLINT, 1, 0);
 		}
-- 
cgit v1.2.3


From 9871c0b0731446f6c12137502153c24c9f1d9dfa Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 17 Sep 2015 11:20:10 +0200
Subject: Added CircleCI for stylechecking.

This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
---
 src/Blocks/BlockPlant.h   |  5 ++---
 src/Blocks/CMakeLists.txt | 13 ++++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockPlant.h b/src/Blocks/BlockPlant.h
index 0e6aca7eb..0155dc466 100644
--- a/src/Blocks/BlockPlant.h
+++ b/src/Blocks/BlockPlant.h
@@ -49,13 +49,12 @@ protected:
 				Light = Blocklight;
 			}
 
-			// Return true if there is enough light
-			// Set m_ShouldDie if the base light amounts are not enough to sustain a plant
+			// Based on light levels, decide between growth, stay and death:
 			if (Light > 8)
 			{
 				return paGrowth;
 			}
-			else if (Blocklight < 9 && SkyLight < 9)
+			else if ((Blocklight < 9) && (SkyLight < 9))
 			{
 				return paDeath;
 			}
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index ed3e321d4..1c12d9fbc 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -9,7 +9,8 @@ SET (SRCS
 	BlockDoor.cpp
 	BlockHandler.cpp
 	BlockPiston.cpp
-	ChunkInterface.cpp)
+	ChunkInterface.cpp
+)
 
 SET (HDRS
 	BlockAnvil.h
@@ -54,12 +55,15 @@ SET (HDRS
 	BlockLilypad.h
 	BlockMelon.h
 	BlockMobHead.h
+	BlockMobSpawner.h
 	BlockMushroom.h
 	BlockMycelium.h
+	BlockNetherrack.h
 	BlockNetherWart.h
 	BlockOre.h
 	BlockPiston.h
 	BlockPlanks.h
+	BlockPlant.h
 	BlockPluginInterface.h
 	BlockPortal.h
 	BlockPressurePlate.h
@@ -72,6 +76,7 @@ SET (HDRS
 	BlockRedstoneTorch.h
 	BlockSand.h
 	BlockSapling.h
+	BlockSeaLantern.h
 	BlockSideways.h
 	BlockSignPost.h
 	BlockSlab.h
@@ -80,8 +85,8 @@ SET (HDRS
 	BlockStems.h
 	BlockStone.h
 	BlockSugarcane.h
-	BlockTNT.h
 	BlockTallGrass.h
+	BlockTNT.h
 	BlockTorch.h
 	BlockTrapdoor.h
 	BlockTripwire.h
@@ -92,8 +97,10 @@ SET (HDRS
 	BroadcastInterface.h
 	ChunkInterface.h
 	ClearMetaOnDrop.h
+	GetHandlerCompileTimeTemplate.h
 	MetaRotator.h
-	WorldInterface.h)
+	WorldInterface.h
+)
 
 if(NOT MSVC)
 	add_library(Blocks ${SRCS} ${HDRS})
-- 
cgit v1.2.3