diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dc6762f2..cef794e97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - Added recipes for more train tracks @Pyritie
 - Added a recipe to get Wood Gas for your food processor in LV (#1491) @Pyritie
 - Regular thorium is also now weakly radioactive @Pyritie
+- Added grape trellises to the list of plants harvestable by baskets (#1510) @Redeix
 ### Bug fixes
 - Some bug fixes for the electric refrigerators @gustovafing
 - Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js
index 686ed06e5..7bfef3f77 100644
--- a/kubejs/server_scripts/tfg/tags.js
+++ b/kubejs/server_scripts/tfg/tags.js
@@ -443,6 +443,11 @@ const registerTFGBlockTags = (event) => {
 	event.add('tfg:harvester_harvestable', '#tfc:fruit_tree_leaves')
 	event.add('tfg:harvester_harvestable', '#tfc:berry_bushes')
 	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')
+	//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')
 
 	event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_large')
 	event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_small')
diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js
index 86eebeca0..7e4e8a6b8 100644
--- a/kubejs/startup_scripts/gtceu/machines.js
+++ b/kubejs/startup_scripts/gtceu/machines.js
@@ -226,8 +226,8 @@ const registerGTCEuMachines = (event) => {
 			.aisle("        CCC        ", "   CC         CC   ", " CC             CC ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
 			.aisle(" S S CC     CC S S ", " S C           C S ", " C               C ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
 			.aisle("     C       C     ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
-			.aisle("S S               S", "S C             C S", "C                 C", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
-			.aisle("    C   FFF   C S  ", "  C     B B     C  ", "C       B B       C", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        EEE        ", "        GGG        ", "        GGG        ", "        GGG        ")
+			.aisle("S S             S S", "S C             C S", "C                 C", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
+			.aisle("    C   FFF   C    ", "  C     B B     C  ", "C       B B       C", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        EEE        ", "        GGG        ", "        GGG        ", "        GGG        ")
 			.aisle("    C   FIF   C    ", "  C      I      C  ", "C        I        C", "         I         ", "         I         ", "         I         ", "         I         ", "         I         ", "         I         ", "         I         ", "        EIE        ", "        GIG        ", "        GKG        ", "        GGG        ")
 			.aisle("    C   FHF   C    ", "  C     B B     C  ", "C       B B       C", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        B B        ", "        EEE        ", "        GGG        ", "        GGG        ", "        GGG        ")
 			.aisle("S S             S S", "S C             C S", "C                 C", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ", "                   ")
@@ -263,7 +263,7 @@ const registerGTCEuMachines = (event) => {
 		.noRecipeModifier()
 		.appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh'))
 		.pattern(definition => FactoryBlockPattern.start()
-			.aisle("          A     A          ", "          A     A          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                          A")
+			.aisle("          A     A          ", "          A     A          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.aisle("        A         A        ", "        A         A        ", "        S         S        ", "        S         S        ", "      CCC         CCC      ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.aisle("          S     S          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "     CC             CC     ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.aisle("     A  S         S  A     ", "     A  S         S  A     ", "     S  S         S  S     ", "     S CC         CC S     ", "     C               C     ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
@@ -289,7 +289,7 @@ const registerGTCEuMachines = (event) => {
 			.aisle("     A  S         S  A     ", "     A  S         S  A     ", "     S  S         S  S     ", "     S CC         CC S     ", "     C               C     ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.aisle("          S     S          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "     CC             CC     ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.aisle("        A         A        ", "        A         A        ", "        S         S        ", "        S         S        ", "      CCC         CCC      ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
-			.aisle("A         A     A          ", "          A     A          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
+			.aisle("          A     A          ", "          A     A          ", "          S     S          ", "          S     S          ", "          CCCCCCC          ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ", "                           ")
 			.where("A", Predicates.blocks('gtceu:light_concrete')
 				.or(Predicates.blocks('gtceu:polished_light_concrete'))
 				.or(Predicates.blocks('gtceu:light_concrete_bricks'))