Clean up force undos and remove particles for non-vanilla saplings.t

Author: tterrag1098

src/main/java/tterrag/treesimulator/TickHandlerTGS.java

@@ -63,11 +63,13 @@ public void tickStart(EnumSet<TickType> type, Object... tickData)
 
 					BonemealEvent event = new BonemealEvent(player, player.worldObj, player.worldObj.getBlockId(pos[0], pos[1], pos[2]), pos[0], pos[1], pos[2]);
 					MinecraftForge.EVENT_BUS.post(event);
+					
+					BlockSapling sapling = (BlockSapling) Block.blocksList[player.worldObj.getBlockId(pos[0], pos[1], pos[2])]; 
 
 	        		if ((double)player.worldObj.rand.nextFloat() < 0.45D)
-	                	((BlockSapling)Block.blocksList[player.worldObj.getBlockId(pos[0], pos[1], pos[2])]).markOrGrowMarked(player.worldObj, pos[0], pos[1], pos[2], player.worldObj.rand);
+	                	sapling.markOrGrowMarked(player.worldObj, pos[0], pos[1], pos[2], player.worldObj.rand);
 
-					if (TreeSimulator.showParticles)
+					if (TreeSimulator.showParticles && sapling.blockID == Block.sapling.blockID)
 						sendPacket(pos[0], pos[1], pos[2], player.worldObj, basePlayer);
 
 					movementCounter = 0;

src/main/java/tterrag/treesimulator/TreeSimulator.java

@@ -32,19 +32,7 @@ public void preInit(FMLPreInitializationEvent event)
 	@EventHandler
 	public void init(FMLInitializationEvent event)
 	{
-<<<<<<< HEAD
-<<<<<<< HEAD
 		TickRegistry.registerTickHandler(new TickHandlerTGS(), Side.SERVER);
-=======
-		tickHandler = new TickHandlerTGS();
-		TickRegistry.registerTickHandler(tickHandler, Side.SERVER);
-		if (event.getSide() == Side.CLIENT && yellingWorks) {
-			micListener = new MicListener();
-		}
->>>>>>> parent of 5194366... Merge pull request #2 from impiaaa/master
-=======
-		TickRegistry.registerTickHandler(new TickHandlerTGS(), Side.SERVER);
->>>>>>> parent of e5bfa06... Merge pull request #1 from impiaaa/master
 	}
 
 	private void initConfig(File file)