Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 15 insertions, 14 deletions

diff --git a/Minecraft.World/StemTile.h b/Minecraft.World/StemTile.h
index ac4fc40c..4685e0a5 100644
--- a/Minecraft.World/StemTile.h
+++ b/Minecraft.World/StemTile.h
@@ -16,10 +16,11 @@ private:
 public:
 	StemTile(int id, Tile *fruit);
 
-    virtual bool mayPlaceOn(int tile);
+	virtual bool mayPlaceOn(int tile);
 public:
 	virtual void tick(Level *level, int x, int y, int z, Random *random);
-    void growCropsToMax(Level *level, int x, int y, int z);
+	virtual void growCrops(Level *level, int x, int y, int z);
+
 private:
 	float getGrowthSpeed(Level *level, int x, int y, int z);
 
@@ -27,21 +28,21 @@ public:
 	using Tile::getColor;
 	int getColor(int data);
 
-    virtual int getColor(LevelSource *level, int x, int y, int z);
-    virtual void updateDefaultShape();
-    virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
-    virtual int getRenderShape();
+	virtual int getColor(LevelSource *level, int x, int y, int z);
+	virtual void updateDefaultShape();
+	virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
+	virtual int getRenderShape();
 
-    int getConnectDir(LevelSource *level, int x, int y, int z);
+	int getConnectDir(LevelSource *level, int x, int y, int z);
 
-    /**
-     * Using this method instead of destroy() to determine if seeds should be
-     * dropped
-     */
-    virtual void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus);
+	/**
+	* Using this method instead of destroy() to determine if seeds should be
+	* dropped
+	*/
+	virtual void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus);
 
-    virtual int getResource(int data, Random *random, int playerBonusLevel);
-    virtual int getResourceCount(Random *random);
+	virtual int getResource(int data, Random *random, int playerBonusLevel);
+	virtual int getResourceCount(Random *random);
 	virtual int cloneTileId(Level *level, int x, int y, int z);
 	void registerIcons(IconRegister *iconRegister);
 	Icon *getAngledTexture();