Index: binaries/data/mods/public/simulation/components/Health.js
===================================================================
--- binaries/data/mods/public/simulation/components/Health.js
+++ binaries/data/mods/public/simulation/components/Health.js
@@ -293,9 +293,17 @@
 	// persistent corpse retaining the ResourceSupply element of the parent.
 	var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
 	var templateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
-	var corpse;
+	let corpse;
 	if (leaveResources)
-		corpse = Engine.AddEntity("resource|" + templateName);
+	{
+		let cmpResourceSupply = Engine.QueryInterface(this.entity, IID_ResourceSupply);
+		if (cmpResourceSupply)
+		{
+			corpse = Engine.AddEntity("resource|" + templateName);
+			let corpseResourceSupply = Engine.QueryInterface(corpse, IID_ResourceSupply);
+			corpseResourceSupply.SetAmount(cmpResourceSupply.GetCurrentAmount());
+		}
+	}
 	else
 		corpse = Engine.AddLocalEntity("corpse|" + templateName);
 
Index: binaries/data/mods/public/simulation/components/ResourceSupply.js
===================================================================
--- binaries/data/mods/public/simulation/components/ResourceSupply.js
+++ binaries/data/mods/public/simulation/components/ResourceSupply.js
@@ -4,10 +4,21 @@
 	"<a:help>Provides a supply of one particular type of resource.</a:help>" +
 	"<a:example>" +
 		"<Amount>1000</Amount>" +
+		"<MaxAmount>1500</MaxAmount>" +
 		"<Type>food.meat</Type>" +
 		"<KillBeforeGather>false</KillBeforeGather>" +
 		"<MaxGatherers>25</MaxGatherers>" +
 		"<DiminishingReturns>0.8</DiminishingReturns>" +
+		"<Growth>" +
+			"<GrowsWhenAliveOnly />" +
+			"<Rate>1</Rate>" +
+			"<Interval>500</Interval>" +
+		"</Growth>" +
+		"<Decay>" +
+			"<DecaysWhenDeadOnly />" +
+			"<Rate>1</Rate>" +
+			"<Interval>1000</Interval>" +
+		"</Decay>" +
 	"</a:example>" +
 	"<element name='KillBeforeGather' a:help='Whether this entity must be killed (health reduced to 0) before its resources can be gathered'>" +
 		"<data type='boolean'/>" +
@@ -15,6 +26,11 @@
 	"<element name='Amount' a:help='Amount of resources available from this entity'>" +
 		"<choice><data type='nonNegativeInteger'/><value>Infinity</value></choice>" +
 	"</element>" +
+	"<optional>" +
+		"<element name='MaxAmount' a:help='The max amount of resource the entity can reach when growing'>" +
+			"<ref name='nonNegativeDecimal'/>" +
+		"</element>" +
+	"</optional>" +
 	"<element name='Type' a:help='Type and Subtype of resource available from this entity'>" +
 		Resources.BuildChoicesSchema(true, true) +
 	"</element>" +
@@ -25,21 +41,70 @@
 		"<element name='DiminishingReturns' a:help='The relative rate of any new gatherer compared to the previous one (geometric sequence). Leave the element out for no diminishing returns.'>" +
 			"<ref name='positiveDecimal'/>" +
 		"</element>" +
+	"</optional>" +
+	"<optional>" +
+		"<element name='Growth' a:help='Optional element for defining whether a resource supply would regenerate when it&quot;s not gathered'>" +
+			"<interleave>" +
+				"<optional>" +
+					"<element name='GrowsWhenAliveOnly' a:help='Only decay if the entity is alive'><empty/></element>" +
+				"</optional>" +
+				"<element name='Rate' a:help='The amount of resource added per tick'>" +
+					"<ref name='nonNegativeDecimal'/>" +
+				"</element>" +
+				"<element name='Interval' a:help='The interval in milliseconds'>" +
+					"<ref name='nonNegativeDecimal'/>" +
+				"</element>" +
+			"</interleave>" +
+		"</element>" +
+	"</optional>" +
+	"<optional>" +
+		"<element name='Decay' a:help='Optional element for defining whether a resource supply would decay when it&quot;s not gathered'>" +
+			"<interleave>" +
+				"<optional>" +
+					"<element name='DecaysWhenDeadOnly' a:help='Only decay if the entity is dead'><empty/></element>" +
+				"</optional>" +
+				"<element name='Rate' a:help='The amount of resource removed per tick'>" +
+					"<ref name='nonNegativeDecimal'/>" +
+				"</element>" +
+				"<element name='Interval' a:help='The interval in milliseconds'>" +
+					"<ref name='nonNegativeDecimal'/>" +
+				"</element>" +
+			"</interleave>" +
+		"</element>" +
 	"</optional>";
 
 ResourceSupply.prototype.Init = function()
 {
 	// Current resource amount (non-negative)
-	this.amount = this.GetMaxAmount();
+	this.amount = +this.template.Amount;
+	this.maxAmount = this.amount;
+	if (this.template.MaxAmount && +this.template.MaxAmount > this.amount)
+		this.maxAmount = +this.template.MaxAmount;
+
+	this.infinite = !isFinite(+this.template.Amount);
+
+	if (this.template.Growth)
+	{
+		this.growsWhenAliveOnly = "GrowsWhenAliveOnly" in this.template.Growth;
+		this.growthRate = ApplyValueModificationsToEntity("ResourceSupply/GrowthRate", +this.template.Growth.Rate, this.entity);
+		this.growthInterval = +this.template.Growth.Interval;
+		this.AddGrowthTimer();
+	}
+
+	if (this.template.Decay && !this.infinite)
+	{
+		this.decaysWhenDeadOnly = "DecaysWhenDeadOnly" in this.template.Decay;
+		this.decayRate = ApplyValueModificationsToEntity("ResourceSupply/DecayRate", +this.template.Decay.Rate, this.entity);
+		this.decayInterval = +this.template.Decay.Interval;
+		this.AddDecayTimer();
+	}
 
 	// List of IDs for each player
 	this.gatherers = [];
-	let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers()
+	let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
 	for (let i = 0; i < numPlayers; ++i)
 		this.gatherers.push([]);
 
-	this.infinite = !isFinite(+this.template.Amount);
-
 	let [type, subtype] = this.template.Type.split('.');
 	this.cachedType = { "generic": type, "specific": subtype };
 };
@@ -56,7 +121,7 @@
 
 ResourceSupply.prototype.GetMaxAmount = function()
 {
-	return +this.template.Amount;
+	return this.maxAmount;
 };
 
 ResourceSupply.prototype.GetCurrentAmount = function()
@@ -74,6 +139,15 @@
 	return this.gatherers.reduce((a, b) => a + b.length, 0);
 };
 
+ResourceSupply.prototype.OnValueModification = function(msg)
+{
+	if (msg.component != "ResourceSupply")
+		return;
+
+	this.decayRate = ApplyValueModificationsToEntity("ResourceSupply/DecayRate", +this.template.Decay.Rate, this.entity);
+	this.growthRate = ApplyValueModificationsToEntity("ResourceSupply/GrowthRate", +this.template.Growth.Rate, this.entity);
+};
+
 /* The rate of each additionnal gatherer rate follow a geometric sequence, with diminishingReturns as common ratio. */
 ResourceSupply.prototype.GetDiminishingReturns = function()
 {
@@ -84,12 +158,19 @@
 		{
 			let numGatherers = this.GetNumGatherers();
 			if (numGatherers > 1)
-				return diminishingReturns == 1 ? 1 : (1. - Math.pow(diminishingReturns, numGatherers)) / (1. - diminishingReturns) / numGatherers;
+				return diminishingReturns == 1 ? 1 : (1 - Math.pow(diminishingReturns, numGatherers)) / (1 - diminishingReturns) / numGatherers;
 		}
 	}
 	return null;
 };
 
+ResourceSupply.prototype.SetAmount = function(newAmount)
+{
+	var oldAmount = this.GetCurrentAmount();
+	this.amount = Math.min(Math.max(newAmount, 0), this.GetMaxAmount());
+	this.UpdateSupplyStatus(oldAmount);
+};
+
 ResourceSupply.prototype.TakeResources = function(rate)
 {
 	// Before changing the amount, activate Fogging if necessary to hide changes
@@ -100,19 +181,10 @@
 	if (this.infinite)
 		return { "amount": rate, "exhausted": false };
 
-	// 'rate' should be a non-negative integer
-
-	var old = this.amount;
-	this.amount = Math.max(0, old - rate);
-	var change = old - this.amount;
-
-	// Remove entities that have been exhausted
-	if (this.amount === 0)
-		Engine.DestroyEntity(this.entity);
-
-	Engine.PostMessage(this.entity, MT_ResourceSupplyChanged, { "from": old, "to": this.amount });
+	let oldAmount = this.GetCurrentAmount();
+	this.SetAmount(oldAmount - rate);
 
-	return { "amount": change, "exhausted": (this.amount === 0) };
+	return { "amount": oldAmount - this.GetCurrentAmount(), "exhausted": this.GetCurrentAmount() === 0 };
 };
 
 ResourceSupply.prototype.GetType = function()
@@ -138,29 +210,99 @@
 		Engine.PostMessage(this.entity, MT_ResourceSupplyNumGatherersChanged, { "to": this.GetNumGatherers() });
 	}
 
+	if (this.growthTimer)
+	{
+		Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer).CancelTimer(this.growthTimer);
+		this.growthTimer = null;
+	}
+
+	if (this.decayTimer)
+	{
+		Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer).CancelTimer(this.decayTimer);
+		this.decayTimer = null;
+	}
+
 	return true;
 };
 
 // should this return false if the gatherer didn't gather from said resource?
 ResourceSupply.prototype.RemoveGatherer = function(gathererID, player)
 {
-	// this can happen if the unit is dead
-	if (player == undefined || player == INVALID_PLAYER)
-	{
-		for (var i = 0; i < this.gatherers.length; ++i)
-			this.RemoveGatherer(gathererID, i);
-	}
-	else
+	if (player != undefined && player != INVALID_PLAYER)
 	{
 		var index = this.gatherers[player].indexOf(gathererID);
 		if (index !== -1)
 		{
-			this.gatherers[player].splice(index,1);
+			this.gatherers[player].splice(index, 1);
 			// broadcast message, mainly useful for the AIs.
 			Engine.PostMessage(this.entity, MT_ResourceSupplyNumGatherersChanged, { "to": this.GetNumGatherers() });
 			return;
 		}
 	}
+	// This can happen if the unit is dead
+	else
+		for (var i = 0; i < this.gatherers.length; ++i)
+			this.RemoveGatherer(gathererID, i);
+
+	let hasGatherers = this.gatherers.some(p => !p.length);
+	if(hasGatherers)
+		return;
+
+	if (this.template.Growth && !this.growthTimer)
+		this.AddGrowthTimer();
+
+	if (this.template.Decay && !this.decayTimer)
+		this.AddDecayTimer();
+};
+
+ResourceSupply.prototype.AddGrowthTimer = function()
+{
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	this.growthTimer = cmpTimer.SetInterval(this.entity, IID_ResourceSupply, "GrowSupply", this.growthInterval, this.growthInterval, undefined);
+};
+
+ResourceSupply.prototype.AddDecayTimer = function()
+{
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	this.decayTimer = cmpTimer.SetInterval(this.entity, IID_ResourceSupply, "DecaySupply", this.decayInterval, this.decayInterval, undefined);
 };
 
+ResourceSupply.prototype.GrowSupply = function()
+{
+	if (this.growsWhenAliveOnly)
+	{
+		let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
+		if (!cmpHealth)
+			return;
+	}
+
+	this.SetAmount(this.GetCurrentAmount() + this.growthRate);
+};
+
+ResourceSupply.prototype.DecaySupply = function()
+{
+	if (this.decaysWhenDeadOnly)
+	{
+		let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
+		if (cmpHealth)
+			return;
+	}
+
+	this.SetAmount(this.GetCurrentAmount() - this.decayRate);
+};
+
+ResourceSupply.prototype.UpdateSupplyStatus = function(oldAmount)
+{
+	// Remove entities that have been exhausted.
+	if (this.GetCurrentAmount() === 0)
+		Engine.DestroyEntity(this.entity);
+
+	// Do not send messages if the resource count didn't change.
+	if (oldAmount == this.GetCurrentAmount())
+		return;
+
+	Engine.PostMessage(this.entity, MT_ResourceSupplyChanged, { "from": oldAmount, "to": this.GetCurrentAmount() });
+};
+
+
 Engine.RegisterComponentType(IID_ResourceSupply, "ResourceSupply", ResourceSupply);
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -12,6 +12,19 @@
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
+  <ResourceSupply>
+    <MaxAmount>200</MaxAmount>
+    <Growth>
+      <GrowsWhenAliveOnly/>
+      <Rate>2</Rate>
+      <Interval>1000</Interval>
+    </Growth>
+    <Decay>
+      <DecaysWhenDeadOnly/>
+      <Rate>1</Rate>
+      <Interval>1000</Interval>
+    </Decay>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/gaia/flora_tree_dead.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/flora_tree_dead.xml
+++ binaries/data/mods/public/simulation/templates/gaia/flora_tree_dead.xml
@@ -3,6 +3,13 @@
   <Identity>
     <SpecificName>Dead Tree</SpecificName>
   </Identity>
+  <ResourceSupply>
+    <Decay>
+      <DecaysWhenDeadOnly/>
+      <Rate>0.1</Rate>
+      <Interval>1000</Interval>
+    </Decay>
+  </ResourceSupply>
   <VisualActor>
     <Actor>flora/trees/tree_dead.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/special/filter/resource.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/filter/resource.xml
+++ binaries/data/mods/public/simulation/templates/special/filter/resource.xml
@@ -9,6 +9,7 @@
        Instead, create a static, unblocking (see #3530 for why) static obstruction.
        TODO: this should probably be generalized as a parameter on entity death or something.
   -->
+  <Health disable=""/>
   <Obstruction replace="">
     <Active>true</Active>
     <BlockMovement>false</BlockMovement>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
@@ -12,5 +12,10 @@
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>8</MaxGatherers>
+    <Decay>
+      <DecaysWhenDeadOnly/>
+      <Rate>1</Rate>
+      <Interval>1000</Interval>
+    </Decay>
   </ResourceSupply>
 </Entity>