Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 ### Changes
+- Increased basic harvest basket durability to 256 @Redeix
+- Remove durability from trowels @Redeix
+- Harvest baskets can now harvest from firmalife greenhouse trellis, bonsai, and hanging planters. @Redeix
 ### Bug fixes
 - Fixed multiple exceptions being thrown during tooltip creation (#3188) @Nebby1999
 ### Translation updates

kubejs/server_scripts/tfg/primitive/tags.primitive.js

@@ -96,6 +96,9 @@ function registerTFGPrimitiveBlockTags(event) {
 	event.add('tfg:harvester_harvestable', '#tfc:any_spreading_bush')
 	event.add('tfg:harvester_harvestable', '#firmalife:grape_strings')
 	event.add('tfg:harvester_harvestable', '#firmalife:grape_trellis_posts_plant')
+	event.add('tfg:harvester_harvestable', 'firmalife:trellis_planter')
+	event.add('tfg:harvester_harvestable', 'firmalife:bonsai_planter')
+	event.add('tfg:harvester_harvestable', 'firmalife:hanging_planter')
 	//added for QOL but doesnt harvest anything
 	event.add('tfg:harvester_harvestable', 'firmalife:grape_fluff_red')
 	event.add('tfg:harvester_harvestable', 'firmalife:grape_fluff_white')

kubejs/startup_scripts/tfg/primitive/items.primitive.js

@@ -40,7 +40,7 @@ function registerTFGPrimitiveItems(event) {
 
 	event.create('tfg:harvest_basket')
 		.parentModel('tfg:item/harvest_basket')
-		.maxDamage(128)
+		.maxDamage(256)
 
 	event.create('tfg:aluminium_harvest_basket')
 		.parentModel('tfg:item/aluminium_harvest_basket')