diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 7a5b86479..fbfad7663 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -3,6 +3,7 @@ **Improvements** - Add new recipe for converting Celestial Combs to Starmetal [\#5458](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5458) ([MuteTiefling](https://github.com/MuteTiefling)) +- Tree of Life structure no longer checks for Wisteria to avoid issues with placement [\#5458](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5458) ([MuteTiefling](https://github.com/MuteTiefling)) ### Enigmatica 6 & Enigmatica 6: Expert v1.10.0 diff --git a/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json b/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json index fe3800966..4dd76dbc3 100644 --- a/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json +++ b/kubejs/data/masterful_machinery/recipes/enigmatic_tree_of_life.json @@ -605,7 +605,7 @@ " ", " ))))))))))))))))))))))))))))))))))))))) ", " )*******4P5E544445 4,4;P5P54444445***) ", - " )****555 R,; 45 4 ST,U66 5 4455**) ", + " )****555 R,; 45 4 T,U66 5 4455**) ", " )***454 : 6 5**) ", " )**55 ,, 55*) ", " )**45 K ,, 5*) ", @@ -632,7 +632,7 @@ " )**4: 5*) ", " )**4 :,,) ", " )***59 :,5*) ", - " )***4; S-) ", + " )***4; -) ", " )***9L 5E*) ", " )***4; -) ", " )***49 V 5P) ", @@ -678,7 +678,7 @@ " ", " ))))))))))))))))))))))))))))))))))))))) ", " )******5P-4R544R54- E5E6PP45-444545***) ", - " )****554 E: 54 S:;66 445**) ", + " )****554 E: 54 :;66 445**) ", " )**4444 6 5**) ", " )*5R4 ;, 5*) ", " )*5 M ,, 5*) ", @@ -703,9 +703,9 @@ " )**4 ??? 4*) ", " )*- ? 5) ", " )**46 5*) ", - " )**4S ,P) ", + " )**4 ,P) ", " )**55 E,E) ", - " )***56 SP) ", + " )***56 P) ", " )***5; V E-) ", " )***59 P) ", " )***5 W P) ", @@ -752,16 +752,16 @@ " ))))))))))))))))))))))))))))))))))))))) ", " )******4-64PR45P-4PR-4ER--65R4PR445***) ", " )***4555 ,: 4 EE 66 455**) ", - " )**554 S 5**) ", + " )**554 5**) ", " )**R5 X ,, 5*) ", " )*5 ;, 5) ", " )*R 5*) ", - " )*4S 5*) ", + " )*4 5*) ", " )*PE 5*) ", " )*-4 X -) ", " )*) 5*) ", " )*- 5-) ", - " )*R V SE-) ", + " )*R V E-) ", " )*5- 44-) ", " )**,; 45) ", " )*-,, ,5) ", @@ -776,7 +776,7 @@ " )*- 71? 45) ", " )*P 11? P) ", " )**5; ? ? 5) ", - " )**5S R) ", + " )**5 R) ", " )**4 ,-) ", " )**45 EE) ", " )***56 W P) ", @@ -825,16 +825,16 @@ " ))))))))))))))))))))))))))))))))))))))) ", " )******--*P-444RP--PRPZE--4-PR-R445***) ", " )***454P ;E6 R ,,-P 4 5**) ", - " )*-455 6 S E, [ 44*) ", + " )*-455 6 E, [ 44*) ", " )**5 * ,, 5*) ", " )*R Y ,, 5) ", " )*P Y 5) ", - " )*)S X S 5*) ", + " )*) X 5*) ", " )**, 5*) ", " )*-5 V X -) ", " )*P 5*) ", " )*-R ;Z) ", - " )*- W S5-) ", + " )*- W 5-) ", " )*5R V 4-) ", " )**;, E5) ", " )*-,, 5-) ", @@ -898,12 +898,12 @@ " ))))))))))))))))))))))))))))))))))))))) ", " )***5**4--ER\\5R--PZRP-*EZ-4--\\--R44***) ", " )**5 55PZ ,,, R R - ERRR Z -4**) ", - " )*R4 5 ,6S 6;,ZR 44*) ", + " )*R4 5 ,6 6;,ZR 44*) ", " )**5 \\Y X] ER ;, P*) ", " )*R Q [ V [ E ,; P*) ", " )*-Z Q -) ", - " )*PE Z Y S 5) ", - " )*-Z ^S X 5-) ", + " )*PE Z Y 5) ", + " )*-Z ^ X 5-) ", " )** W X V _Z P) ", " )*-P X ^ [ 5*) ", " )*-R [ Q -Z) ", @@ -927,10 +927,10 @@ " )**4 P) ", " )**5 W Y R) ", " )**549 XZ-) ", - " )**59 W [ S Y R\\) ", + " )**59 W [ Y R\\) ", " )**55 -)) ", - " )****E S >> P**) ", - " )****545 S9 ; >**> -**) ", + " )****E >> P**) ", + " )****545 9 ; >**> -**) ", " )*******P4 E- 4 6 R-R>**>ER R -***) ", " )*******---P--R-RP-E-*R-**-----P-P****) ", " ))))))))))))))))))))))))))))))))))))))) ", @@ -976,8 +976,8 @@ " )*-) QZ X W X6E Y =;,=-P*) ", " )*-\\X Y \\E YY == P-) ", " )*R, [ \\ QY E Z P5) ", - " )*-Z) \\S^_ * 5-) ", - " )*P SW ^X W X\\Z -) ", + " )*-Z) \\ ^_ * 5-) ", + " )*P W ^X W X\\Z -) ", " )*-R X \\ X 5*) ", " )*--Z * Y P\\) ", " )*-- [ X X ,5-) ", @@ -994,16 +994,16 @@ " )*-*[ X ?1 Q P) ", " )*-PW ?11? *) ", " )*-R 117 ? E) ", - " )*-9 111?? W S) ", + " )*-9 111?? W ) ", " )*P 117? N 9) ", " )*- EP) ", " )*P5 Y Q R) ", " )*- [ W Y *-) ", " )**5 QY Z--) ", - " )**59 X X S Y V P)) ", + " )**59 X X Y V P)) ", " )*-4, R-) ", - " )***5E9S ,, E -)*) ", - " )****444 S 6 ,**, E- Z***) ", + " )***5E9 ,, E -)*) ", + " )****444 6 ,**, E- Z***) ", " )******- 4R ;- 4 E9- 5**5RP *****) ", " )******-PPRP--RPPR-E**-****-*P-P-*****) ", " ))))))))))))))))))))))))))))))))))))))) ", @@ -1050,22 +1050,22 @@ " )*--\\ [ \\QZEE Y *\\ QYQ ,; -Z*) ", " )*-); Q XEZZ* ZYQ EE6 Y Z P-) ", " )*-ZZ ZE Z QZ E Z X 5-) ", - " )*R SW ^ ZZ X W^]*ZZ P*) ", + " )*R W ^ ZZ X W^]*ZZ P*) ", " )*-ZR Z XE YZ X -*) ", - " )*--P \\* ] S Q P\\) ", + " )*--P \\* ] Q P\\) ", " )*->=>\\ * * P-) ", - " )*-,,>> Y S X E--) ", - " )*-,,,= Y [ S S;--) ", + " )*-,,>> Y X E--) ", + " )*-,,,= Y [ ;--) ", " )*-,,,= * PZ) ", " )*-,,>> N -*) ", " )*-==> Z[ X Z Z) ", " )*Z Z -) ", - " )*-E S O * --) ", - " )*-\\ S X N * ---) ", + " )*-E O * --) ", + " )*-\\ X N * ---) ", " )*P\\\\ * ? [ *ZZZZ R) ", - " )PR* ??? S X \\ZY )-) ", + " )PR* ??? X \\ZY )-) ", " )*P*X X 7?1 YY Z-) ", - " )*--W H??? S X 5) ", + " )*--W H??? X 5) ", " )*-6 X ?? Z-) ", " )*PR W X E) ", " )PRZ[ N EE) ", @@ -1074,7 +1074,7 @@ " )*- Z X YY )-) ", " )*P YY Z)) ", " )*-59 Z * -E-Y\\YW R-) ", - " )*-*E9 S >>>>-E\\ )*) ", + " )*-*E9 >>>>-E\\ )*) ", " )***59 E 9 >>,,>>E- ***) ", " )***55 4 E E->,**,>--R \\***) ", " )*****--- R-P R R *->5**5>- R* *****) ", @@ -1125,29 +1125,29 @@ " )*--\\E ZZZZZ Z* *ZZEE X\\Z XZ- 5-) ", " )*-ZP EW EE)]ZZZ *6 6 *^ZZZZ ) Z -*) ", " )*-Z` Z XE Z\\ E Y\\Z^ * -*) ", - " )*-ZZ ZZ\\ )E *_ S QYY* R*) ", + " )*-ZZ ZZ\\ )E *_ QYY* R*) ", " )*---`Z Z \\ X* Y P-) ", - " )*----Z\\ YYES * S X X ---) ", - " )*-----* YYQ X\\ X S S,--) ", + " )*----Z\\ YYE * X X ---) ", + " )*-----* YYQ X\\ X ,--) ", " )*-----`\\ Q X X \\ZP) ", - " )*-----Z\\ S N RZ) ", + " )*-----Z\\ N RZ) ", " )*----ZZ** X [ \\ Z Z) ", " )*-EZZ Z\\ ? \\ X P) ", - " )*-E9S * ?? ** --) ", - " )*--*X Z S ?11 Z N *) --R) ", + " )*-E9 * ?? ** --) ", + " )*--*X Z ?11 Z N *) --R) ", " )*-R* \\6 111 Z)ZZZZZ* R) ", - " )*-\\ 117 S * ZZYY ZR) ", + " )*-\\ 117 * ZZYY ZR) ", " )*-P* \\ ? YQY )-) ", - " )*--W N S S Q *Z-) ", + " )*--W N Q *Z-) ", " )*-6 \\ *-) ", " )*-Z W X )-) ", " )*-PZ N [;E) ", " )*PR Q ,E*) ", - " )*-ZZ \\Q [ Y S )) ", + " )*-ZZ \\Q [ Y )) ", " )*PZ-ZX Y Z YY ZZ*) ", " )*- Q E6*RQY ))*) ", " )*-5E \\ Z\\E*****`YW )*) ", - " )*-999 E S S -******-R* )**) ", + " )*-999 E -******-R* )**) ", " )****- E 6Z*******-*R* *-**) ", " )***** X E - aZ**********RRZ-***) ", " )*****---R R9-P - ***********-*Z****) ", @@ -1200,27 +1200,27 @@ " )***ZZZE; XE Z Z\\ Z EE Q*ZZZ \\ZZ-\\*) ", " )***ZZZZZ* ZZZZZ] EE6 Z YY\\ * R-) ", " )*-Z--Z Z* )E)Z \\ XEZ] QY Z \\--*) ", - " )*-----ZZYYY)E \\ZZE E S) * *\\ 6--P) ", + " )*-----ZZYYY)E \\ZZE E ) * *\\ 6--P) ", " )*-----ZZ*YY X\\ZX6 EE E6E E,--) ", " )*-----`Z Y X ZZ * EX) * 6 *Z-) ", - " )*-----ZZ*QXS X N 6 -Z) ", + " )*-----ZZ*QX X N 6 -Z) ", " )*-----ZZ \\ ? Z * \\ Z Z R) ", " )*-Z--ZZZ* 11 * *Z \\ Z \\Z *) ", " )*--ZEZ Z 111 \\\\ )***\\ *R) ", " )*-\\\\*ZZ E 17? \\ N ) **Z Z--) ", " )*-\\\\ Z **E ? Z\\ZZZZZZZZ*-) ", " )*-** E6E EE \\ ZZ*ZY*ZZP) ", - " )*--*S * E6 \\YZY\\ZZR) ", - " )*--9 N EE S \\QY )ZP) ", + " )*--* * E6 \\YZY\\ZZR) ", + " )*--9 N EE \\QY )ZP) ", " )*- Z X -) ", " )*** X \\ *-) ", " )**PZ Y X N X6-) ", - " )**P X YYY S [ ,9*) ", - " )**-ZZ Y\\Y X Y Y S)*) ", + " )**P X YYY [ ,9*) ", + " )**-ZZ Y\\Y X Y Y )*) ", " )***--Z \\ 6P6 YY ))*) ", - " )*-99 S Z YY 6ZZ***ERYQ Z)*) ", + " )*-99 Z YY 6ZZ***ERYQ Z)*) ", " )*-99 X * R ;Z*******ZYZ )**) ", - " )*--6 ES S EZ*********Z *)**) ", + " )*--6 E EZ*********Z *)**) ", " )*-*--- - -R-ZZ**********ZZ)***) ", " )****** Z E6 - ZZ***********Z-****) ", " )*****---RP-E*--R-PZ******************) ", @@ -1278,20 +1278,20 @@ " )****ZZZZZ*)XEE1111EX\\Z* *E ZE\\ZZ R*Z-) ", " )****--ZZZZ*E 11?16E)E) *H EE\\RR\\R-R) ", " )****-ZZZ ZE H7? EZ*6)Z *Z *Z Z ZZZ-) ", - " )****-EZZZ 111S ) ZZZZ ZZZ** **) ", + " )****-EZZZ 111 ) ZZZZ ZZZ** **) ", " )*****Z Z)ZE??? ZZZ ) * ZZZZZZZR) ", " )*****Z Z\\E *Z NZZ\\Z )ZZ ZZ -) ", " )*-R*\\Z*ZZZZ 6 EZ\\ ZZZZZZZZZ -) ", " )*-P*\\ ZZEZE E )6*\\ Z ZZZZZ ZZ-) ", - " )*--ES 6\\Z E ) 6 * ZZ*ZZZZP) ", + " )*--E 6\\Z E ) 6 * ZZ*ZZZZP) ", " )*---*E N V E ZYY Y)ZZ-) ", - " )**-6 Z E \\ Y S-) ", + " )**-6 Z E \\ Y -) ", " )*-RZ X Y Z EE \\ \\ 6)-) ", " )**PZ YYQ Z X N Z Z)-) ", - " )***Z))YYYY E S Q X S )EE*) ", - " )***--\\ YZ Z* YQ S 6EZ Y E**) ", + " )***Z))YYYY E Q X )EE*) ", + " )***--\\ YZ Z* YQ 6EZ Y E**) ", " )***---Q Z ZE 6 X *Q ZZZ)P6YX )Z**) ", - " )***---S E ZZ QY 6EP****ZEY) )**) ", + " )***--- E ZZ QY 6EP****ZEY) )**) ", " )*---- Z X )6 Y\\ EEE******Z`-` )**) ", " )*--69 EE ER * E************\\***) ", " )***--; )ZXZ ZZZa*****************) ", @@ -1351,18 +1351,18 @@ " )********ZZZ\\EE ?711?ZZZZE\\ ZZZ)*ZZ-) ", " )*********ZZZE c?111?Z)ZEEE)*Z )****) ", " )********ZZZEN E 111Z?))ZZEZZZZ*ZZ**) ", - " )*******ZZZE S ?EZZZZZZZZZZZ*****) ", + " )*******ZZZE ?EZZZZZZZZZZZ*****) ", " )*******ZZZ E ?ZZZZZZZZZZZZZZZ*) ", " )*****Z*)ZZ\\ EE *ZZH)ZZZ`ZZZZZZ -) ", " )******ZZZZ) E **ZZZ ZZZZZZZZZZ -) ", " )****Z\\\\ZZZZ * *ZZZ\\ZZZZZ Z ZZ P) ", " )*--ZE E)ZEE EZE )*EEZZZZZZZZZZ--) ", " )*--Z*E ))E)N EEZ *EEZZZYZ` ZZ -) ", - " )**-E )ZZ Z 6EEZZZ )ZS-) ", + " )**-E )ZZ Z 6EEZZZ )Z -) ", " )*-R ) ) Z\\Z E 6 \\ Z6 Z Z *66E*) ", " )**PZZ )Y Z*\\ \\E Z N E 6 Z6E-*) ", - " )***ZZ)Y\\Z\\ ZE E YYZ E \\ S )E**) ", - " )****ZZ`Y` \\E6* QYY SEZPP) 9E**) ", + " )***ZZ)Y\\Z\\ ZE E YYZ E \\ )E**) ", + " )****ZZ`Y` \\E6* QYY EZPP) 9E**) ", " )***Z-Z* Z ZE)\\6\\ ZY*Z 9EZZZZ)ZEZ 6-**) ", " )***Z--EZ\\E Z\\\\ 6 *YPZ6EE****Z ZZZZ***) ", " )*-Z*ZZ EEZEZZ-\\*RQ* *********ZZZZ`***) ", @@ -1435,7 +1435,7 @@ " )**-EZZ)-*ZZZZ )EZZE6EZ \\Z-EEZZZ Z--E*) ", " )**EZ-)YZY\\Z--ZZ)EZZEN ZPE EEZ)----*) ", " )****ZZZZZZ-)Z-E*YZYZ66 Z-PZ Z EE-P**) ", - " )***Z---ZZZZ-Z)Z *YYZS9EEZ--)))6E66-**) ", + " )***Z---ZZZZ-Z)Z *YYZ 9EEZ--)))6E66-**) ", " )***-EEZZZ ZZ-Z-Z ZY**9EE-ZZZZ--ZE-***) ", " )***--ZEZZ ZZZZ) Z *****Z****ZZ---***) ", " )***ZZ Z)ZZ-ZZZZZ**********Z*******) ", @@ -6836,7 +6836,6 @@ "P": { "block": "chipped:dried_kelp_block_12" }, "Q": { "block": "botania:bifrost_perm" }, "R": { "tag": "enigmatica:tree_of_life/oak" }, - "S": { "block": "environmental:white_hanging_wisteria_leaves" }, "T": { "block": "masterfulmachinery:enigmatic_tree_of_life_item_port_items_input" }, "U": { "block": "masterfulmachinery:enigmatic_tree_of_life_item_port_items_output" }, "V": { "block": "chipped:soul_lantern_2" },