diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json
index cf790fdd4..cbf98b2bb 100644
--- a/.github/buildtools/modpack/manifest.json
+++ b/.github/buildtools/modpack/manifest.json
@@ -16,43 +16,13 @@
"projectID": 385053,
"files": [
{
- "projectID": 823106,
- "fileID": 4906217,
+ "projectID": 250398,
+ "fileID": 4646682,
"required": true
},
{
- "projectID": 270441,
- "fileID": 5274678,
- "required": true
- },
- {
- "projectID": 238222,
- "fileID": 5101366,
- "required": true
- },
- {
- "projectID": 324717,
- "fileID": 5339264,
- "required": true
- },
- {
- "projectID": 438332,
- "fileID": 4715408,
- "required": true
- },
- {
- "projectID": 891816,
- "fileID": 5064623,
- "required": true
- },
- {
- "projectID": 973588,
- "fileID": 5256355,
- "required": true
- },
- {
- "projectID": 411045,
- "fileID": 4578649,
+ "projectID": 333287,
+ "fileID": 5371910,
"required": true
},
{
@@ -60,24 +30,429 @@
"fileID": 5293020,
"required": true
},
+ {
+ "projectID": 738663,
+ "fileID": 4742680,
+ "required": true
+ },
+ {
+ "projectID": 844019,
+ "fileID": 5141430,
+ "required": true
+ },
+ {
+ "projectID": 581495,
+ "fileID": 5299671,
+ "required": true
+ },
+ {
+ "projectID": 401648,
+ "fileID": 4863626,
+ "required": true
+ },
+ {
+ "projectID": 280510,
+ "fileID": 4911084,
+ "required": true
+ },
+ {
+ "projectID": 891816,
+ "fileID": 5064623,
+ "required": true
+ },
+ {
+ "projectID": 60089,
+ "fileID": 5338457,
+ "required": true
+ },
+ {
+ "projectID": 439890,
+ "fileID": 5099752,
+ "required": true
+ },
+ {
+ "projectID": 273744,
+ "fileID": 5299142,
+ "required": true
+ },
+ {
+ "projectID": 254284,
+ "fileID": 5345142,
+ "required": true
+ },
+ {
+ "projectID": 438332,
+ "fileID": 4715408,
+ "required": true
+ },
+ {
+ "projectID": 931925,
+ "fileID": 5342269,
+ "required": true
+ },
+ {
+ "projectID": 404465,
+ "fileID": 5364190,
+ "required": true
+ },
+ {
+ "projectID": 627824,
+ "fileID": 5116549,
+ "required": true
+ },
+ {
+ "projectID": 233019,
+ "fileID": 4578262,
+ "required": true
+ },
+ {
+ "projectID": 714158,
+ "fileID": 5316956,
+ "required": true
+ },
+ {
+ "projectID": 453394,
+ "fileID": 5280601,
+ "required": true
+ },
+ {
+ "projectID": 674852,
+ "fileID": 5142065,
+ "required": true
+ },
+ {
+ "projectID": 238086,
+ "fileID": 5268032,
+ "required": true
+ },
+ {
+ "projectID": 662156,
+ "fileID": 4944918,
+ "required": true
+ },
+ {
+ "projectID": 433760,
+ "fileID": 5307870,
+ "required": true
+ },
+ {
+ "projectID": 841001,
+ "fileID": 5356968,
+ "required": true
+ },
+ {
+ "projectID": 314905,
+ "fileID": 4596742,
+ "required": true
+ },
+ {
+ "projectID": 890405,
+ "fileID": 5369020,
+ "required": true
+ },
+ {
+ "projectID": 952386,
+ "fileID": 4971650,
+ "required": true
+ },
+ {
+ "projectID": 982512,
+ "fileID": 5224093,
+ "required": true
+ },
+ {
+ "projectID": 871755,
+ "fileID": 5334006,
+ "required": true
+ },
+ {
+ "projectID": 255389,
+ "fileID": 5370490,
+ "required": true
+ },
+ {
+ "projectID": 790626,
+ "fileID": 5288164,
+ "required": true
+ },
+ {
+ "projectID": 289412,
+ "fileID": 5378300,
+ "required": true
+ },
+ {
+ "projectID": 961856,
+ "fileID": 5107131,
+ "required": true
+ },
+ {
+ "projectID": 635427,
+ "fileID": 4680832,
+ "required": true
+ },
+ {
+ "projectID": 663477,
+ "fileID": 5390369,
+ "required": true
+ },
+ {
+ "projectID": 847065,
+ "fileID": 5253751,
+ "required": true
+ },
+ {
+ "projectID": 237307,
+ "fileID": 4600191,
+ "required": true
+ },
+ {
+ "projectID": 570017,
+ "fileID": 5229844,
+ "required": true
+ },
+ {
+ "projectID": 720848,
+ "fileID": 4608859,
+ "required": true
+ },
+ {
+ "projectID": 302973,
+ "fileID": 5276689,
+ "required": true
+ },
+ {
+ "projectID": 348521,
+ "fileID": 4973441,
+ "required": true
+ },
+ {
+ "projectID": 618298,
+ "fileID": 5326245,
+ "required": true
+ },
+ {
+ "projectID": 950924,
+ "fileID": 4961778,
+ "required": true
+ },
+ {
+ "projectID": 404468,
+ "fileID": 5267190,
+ "required": true
+ },
+ {
+ "projectID": 263420,
+ "fileID": 5262365,
+ "required": true
+ },
+ {
+ "projectID": 407206,
+ "fileID": 5355342,
+ "required": true
+ },
+ {
+ "projectID": 280294,
+ "fileID": 4586784,
+ "required": true
+ },
+ {
+ "projectID": 975460,
+ "fileID": 5278170,
+ "required": true
+ },
+ {
+ "projectID": 495476,
+ "fileID": 5373244,
+ "required": true
+ },
+ {
+ "projectID": 973588,
+ "fileID": 5256355,
+ "required": true
+ },
+ {
+ "projectID": 441647,
+ "fileID": 5277816,
+ "required": true
+ },
+ {
+ "projectID": 410295,
+ "fileID": 5028413,
+ "required": true
+ },
+ {
+ "projectID": 627196,
+ "fileID": 5090810,
+ "required": true
+ },
+ {
+ "projectID": 491890,
+ "fileID": 5344499,
+ "required": true
+ },
+ {
+ "projectID": 957920,
+ "fileID": 5226922,
+ "required": true
+ },
+ {
+ "projectID": 257814,
+ "fileID": 5379501,
+ "required": true
+ },
+ {
+ "projectID": 459929,
+ "fileID": 5217955,
+ "required": true
+ },
+ {
+ "projectID": 858542,
+ "fileID": 5284015,
+ "required": true
+ },
+ {
+ "projectID": 688367,
+ "fileID": 4719290,
+ "required": true
+ },
+ {
+ "projectID": 308240,
+ "fileID": 5161389,
+ "required": true
+ },
+ {
+ "projectID": 667299,
+ "fileID": 5376023,
+ "required": true
+ },
+ {
+ "projectID": 889915,
+ "fileID": 5257897,
+ "required": true
+ },
+ {
+ "projectID": 899986,
+ "fileID": 5125661,
+ "required": true
+ },
+ {
+ "projectID": 908741,
+ "fileID": 5352230,
+ "required": true
+ },
+ {
+ "projectID": 245028,
+ "fileID": 4891607,
+ "required": true
+ },
+ {
+ "projectID": 658722,
+ "fileID": 4594978,
+ "required": true
+ },
+ {
+ "projectID": 232131,
+ "fileID": 4635878,
+ "required": true
+ },
+ {
+ "projectID": 633412,
+ "fileID": 5016280,
+ "required": true
+ },
+ {
+ "projectID": 272335,
+ "fileID": 5228968,
+ "required": true
+ },
+ {
+ "projectID": 689467,
+ "fileID": 5285344,
+ "required": true
+ },
+ {
+ "projectID": 499980,
+ "fileID": 5372910,
+ "required": true
+ },
+ {
+ "projectID": 410811,
+ "fileID": 4896152,
+ "required": true
+ },
+ {
+ "projectID": 947914,
+ "fileID": 5381714,
+ "required": true
+ },
+ {
+ "projectID": 324717,
+ "fileID": 5390389,
+ "required": true
+ },
+ {
+ "projectID": 326652,
+ "fileID": 5170315,
+ "required": true
+ },
+ {
+ "projectID": 964322,
+ "fileID": 5312604,
+ "required": true
+ },
+ {
+ "projectID": 411045,
+ "fileID": 4578649,
+ "required": true
+ },
+ {
+ "projectID": 823106,
+ "fileID": 4906217,
+ "required": true
+ },
+ {
+ "projectID": 454372,
+ "fileID": 5102258,
+ "required": true
+ },
+ {
+ "projectID": 422301,
+ "fileID": 5296475,
+ "required": true
+ },
+ {
+ "projectID": 256717,
+ "fileID": 5278538,
+ "required": true
+ },
+ {
+ "projectID": 351441,
+ "fileID": 4613538,
+ "required": true
+ },
+ {
+ "projectID": 852668,
+ "fileID": 4710223,
+ "required": true
+ },
+ {
+ "projectID": 238222,
+ "fileID": 5101366,
+ "required": true
+ },
+ {
+ "projectID": 328085,
+ "fileID": 4835191,
+ "required": true
+ },
{
"projectID": 916493,
"fileID": 4988266,
"required": true
},
{
- "projectID": 537533,
- "fileID": 5358796,
- "required": true
- },
- {
- "projectID": 470013,
- "fileID": 4923669,
- "required": true
- },
- {
- "projectID": 317780,
- "fileID": 5262424,
+ "projectID": 943925,
+ "fileID": 4926070,
"required": true
},
{
@@ -91,83 +466,8 @@
"required": true
},
{
- "projectID": 263420,
- "fileID": 5262365,
- "required": true
- },
- {
- "projectID": 908741,
- "fileID": 5352230,
- "required": true
- },
- {
- "projectID": 348521,
- "fileID": 4973441,
- "required": true
- },
- {
- "projectID": 670986,
- "fileID": 5093785,
- "required": true
- },
- {
- "projectID": 326652,
- "fileID": 5170315,
- "required": true
- },
- {
- "projectID": 351441,
- "fileID": 4613538,
- "required": true
- },
- {
- "projectID": 292038,
- "fileID": 4594106,
- "required": true
- },
- {
- "projectID": 282001,
- "fileID": 5293514,
- "required": true
- },
- {
- "projectID": 254284,
- "fileID": 5345142,
- "required": true
- },
- {
- "projectID": 689467,
- "fileID": 5285344,
- "required": true
- },
- {
- "projectID": 280510,
- "fileID": 4911084,
- "required": true
- },
- {
- "projectID": 531761,
- "fileID": 5140912,
- "required": true
- },
- {
- "projectID": 435044,
- "fileID": 4596768,
- "required": true
- },
- {
- "projectID": 889915,
- "fileID": 5257897,
- "required": true
- },
- {
- "projectID": 847065,
- "fileID": 5253751,
- "required": true
- },
- {
- "projectID": 820815,
- "fileID": 5046696,
+ "projectID": 927874,
+ "fileID": 5112443,
"required": true
},
{
@@ -175,589 +475,139 @@
"fileID": 4925840,
"required": true
},
- {
- "projectID": 410295,
- "fileID": 5028413,
- "required": true
- },
- {
- "projectID": 429235,
- "fileID": 4810975,
- "required": true
- },
- {
- "projectID": 257814,
- "fileID": 5342968,
- "required": true
- },
- {
- "projectID": 828656,
- "fileID": 4932788,
- "required": true
- },
- {
- "projectID": 272335,
- "fileID": 5228968,
- "required": true
- },
- {
- "projectID": 439890,
- "fileID": 5099752,
- "required": true
- },
- {
- "projectID": 422301,
- "fileID": 5296475,
- "required": true
- },
- {
- "projectID": 441647,
- "fileID": 5277816,
- "required": true
- },
- {
- "projectID": 308240,
- "fileID": 5161389,
- "required": true
- },
- {
- "projectID": 251407,
- "fileID": 4751740,
- "required": true
- },
- {
- "projectID": 975460,
- "fileID": 5278170,
- "required": true
- },
- {
- "projectID": 300331,
- "fileID": 4832944,
- "required": true
- },
- {
- "projectID": 938643,
- "fileID": 5109692,
- "required": true
- },
- {
- "projectID": 580555,
- "fileID": 5311316,
- "required": true
- },
- {
- "projectID": 940350,
- "fileID": 5313702,
- "required": true
- },
- {
- "projectID": 674852,
- "fileID": 5142065,
- "required": true
- },
- {
- "projectID": 688367,
- "fileID": 4719290,
- "required": true
- },
- {
- "projectID": 404465,
- "fileID": 5364190,
- "required": true
- },
- {
- "projectID": 549394,
- "fileID": 4606534,
- "required": true
- },
- {
- "projectID": 880532,
- "fileID": 5331987,
- "required": true
- },
- {
- "projectID": 256717,
- "fileID": 5278538,
- "required": true
- },
- {
- "projectID": 491890,
- "fileID": 5065299,
- "required": true
- },
- {
- "projectID": 454372,
- "fileID": 5102258,
- "required": true
- },
- {
- "projectID": 720848,
- "fileID": 4608859,
- "required": true
- },
- {
- "projectID": 622112,
- "fileID": 5280439,
- "required": true
- },
- {
- "projectID": 551736,
- "fileID": 4731947,
- "required": true
- },
- {
- "projectID": 658722,
- "fileID": 4594978,
- "required": true
- },
- {
- "projectID": 260262,
- "fileID": 4581167,
- "required": true
- },
- {
- "projectID": 429926,
- "fileID": 4755295,
- "required": true
- },
- {
- "projectID": 662156,
- "fileID": 4944918,
- "required": true
- },
- {
- "projectID": 328085,
- "fileID": 4835191,
- "required": true
- },
- {
- "projectID": 238086,
- "fileID": 5268032,
- "required": true
- },
- {
- "projectID": 404468,
- "fileID": 5267190,
- "required": true
- },
- {
- "projectID": 309927,
- "fileID": 5296876,
- "required": true
- },
- {
- "projectID": 852668,
- "fileID": 4710223,
- "required": true
- },
- {
- "projectID": 354353,
- "fileID": 4891706,
- "required": true
- },
- {
- "projectID": 1003785,
- "fileID": 5310649,
- "required": true
- },
- {
- "projectID": 459929,
- "fileID": 5217955,
- "required": true
- },
- {
- "projectID": 550678,
- "fileID": 4627738,
- "required": true
- },
- {
- "projectID": 495476,
- "fileID": 5330447,
- "required": true
- },
- {
- "projectID": 676136,
- "fileID": 5200949,
- "required": true
- },
- {
- "projectID": 297038,
- "fileID": 5290583,
- "required": true
- },
- {
- "projectID": 961856,
- "fileID": 5107131,
- "required": true
- },
- {
- "projectID": 314905,
- "fileID": 4596742,
- "required": true
- },
- {
- "projectID": 663477,
- "fileID": 4826822,
- "required": true
- },
- {
- "projectID": 302973,
- "fileID": 5276689,
- "required": true
- },
- {
- "projectID": 273744,
- "fileID": 5299142,
- "required": true
- },
- {
- "projectID": 922713,
- "fileID": 5263041,
- "required": true
- },
- {
- "projectID": 570630,
- "fileID": 5096206,
- "required": true
- },
- {
- "projectID": 912469,
- "fileID": 5328442,
- "required": true
- },
- {
- "projectID": 686911,
- "fileID": 5356031,
- "required": true
- },
- {
- "projectID": 240633,
- "fileID": 4655091,
- "required": true
- },
- {
- "projectID": 513402,
- "fileID": 5314558,
- "required": true
- },
- {
- "projectID": 459701,
- "fileID": 4766090,
- "required": true
- },
- {
- "projectID": 223794,
- "fileID": 5253401,
- "required": true
- },
- {
- "projectID": 950924,
- "fileID": 4961778,
- "required": true
- },
- {
- "projectID": 688231,
- "fileID": 5277873,
- "required": true
- },
- {
- "projectID": 255389,
- "fileID": 5335454,
- "required": true
- },
- {
- "projectID": 559313,
- "fileID": 4869749,
- "required": true
- },
- {
- "projectID": 841001,
- "fileID": 5356968,
- "required": true
- },
- {
- "projectID": 931925,
- "fileID": 5342269,
- "required": true
- },
- {
- "projectID": 280294,
- "fileID": 4586784,
- "required": true
- },
- {
- "projectID": 927874,
- "fileID": 5112443,
- "required": true
- },
- {
- "projectID": 871755,
- "fileID": 5239425,
- "required": true
- },
- {
- "projectID": 233019,
- "fileID": 4578262,
- "required": true
- },
{
"projectID": 357540,
"fileID": 4699629,
"required": true
},
- {
- "projectID": 410811,
- "fileID": 4896152,
- "required": true
- },
- {
- "projectID": 407206,
- "fileID": 5355342,
- "required": true
- },
- {
- "projectID": 833233,
- "fileID": 4734074,
- "required": true
- },
- {
- "projectID": 880630,
- "fileID": 5278184,
- "required": true
- },
- {
- "projectID": 618298,
- "fileID": 5326245,
- "required": true
- },
- {
- "projectID": 570017,
- "fileID": 5229844,
- "required": true
- },
- {
- "projectID": 266890,
- "fileID": 5271584,
- "required": true
- },
- {
- "projectID": 964322,
- "fileID": 5312604,
- "required": true
- },
- {
- "projectID": 245028,
- "fileID": 4891607,
- "required": true
- },
- {
- "projectID": 289412,
- "fileID": 5363570,
- "required": true
- },
- {
- "projectID": 982512,
- "fileID": 5224093,
- "required": true
- },
- {
- "projectID": 858542,
- "fileID": 5284015,
- "required": true
- },
- {
- "projectID": 899986,
- "fileID": 5125661,
- "required": true
- },
- {
- "projectID": 511770,
- "fileID": 5117077,
- "required": true
- },
- {
- "projectID": 627196,
- "fileID": 5090810,
- "required": true
- },
- {
- "projectID": 633412,
- "fileID": 5016280,
- "required": true
- },
- {
- "projectID": 581495,
- "fileID": 5299671,
- "required": true
- },
- {
- "projectID": 232131,
- "fileID": 4635878,
- "required": true
- },
- {
- "projectID": 401648,
- "fileID": 4863626,
- "required": true
- },
- {
- "projectID": 947914,
- "fileID": 5199640,
- "required": true
- },
- {
- "projectID": 499980,
- "fileID": 5361081,
- "required": true
- },
- {
- "projectID": 431430,
- "fileID": 4731559,
- "required": true
- },
- {
- "projectID": 416294,
- "fileID": 4944325,
- "required": true
- },
- {
- "projectID": 663658,
- "fileID": 5326142,
- "required": true
- },
- {
- "projectID": 367706,
- "fileID": 5153192,
- "required": true
- },
- {
- "projectID": 453394,
- "fileID": 5280601,
- "required": true
- },
- {
- "projectID": 738663,
- "fileID": 4742680,
- "required": true
- },
- {
- "projectID": 952112,
- "fileID": 5064493,
- "required": true
- },
- {
- "projectID": 930207,
- "fileID": 5302292,
- "required": true
- },
- {
- "projectID": 952386,
- "fileID": 4971650,
- "required": true
- },
- {
- "projectID": 635427,
- "fileID": 4680832,
- "required": true
- },
- {
- "projectID": 60089,
- "fileID": 5338457,
- "required": true
- },
- {
- "projectID": 667299,
- "fileID": 5302277,
- "required": true
- },
- {
- "projectID": 790626,
- "fileID": 5288164,
- "required": true
- },
- {
- "projectID": 957920,
- "fileID": 5226922,
- "required": true
- },
- {
- "projectID": 943925,
- "fileID": 4926070,
- "required": true
- },
- {
- "projectID": 316582,
- "fileID": 5157034,
- "required": true
- },
- {
- "projectID": 333287,
- "fileID": 5355777,
- "required": true
- },
- {
- "projectID": 492574,
- "fileID": 4580511,
- "required": true
- },
- {
- "projectID": 890405,
- "fileID": 5253480,
- "required": true
- },
- {
- "projectID": 419699,
- "fileID": 5137938,
- "required": true
- },
- {
- "projectID": 387638,
- "fileID": 4691333,
- "required": true
- },
- {
- "projectID": 250398,
- "fileID": 4646682,
- "required": true
- },
- {
- "projectID": 283644,
- "fileID": 5098182,
- "required": true
- },
- {
- "projectID": 306770,
- "fileID": 4966125,
- "required": true
- },
- {
- "projectID": 714158,
- "fileID": 5316956,
- "required": true
- },
- {
- "projectID": 433760,
- "fileID": 5307870,
- "required": true
- },
- {
- "projectID": 892005,
- "fileID": 5297417,
- "required": true
- },
- {
- "projectID": 844019,
- "fileID": 5141430,
- "required": true
- },
{
"projectID": 274259,
"fileID": 4882500,
"required": true
},
{
- "projectID": 237307,
- "fileID": 4600191,
+ "projectID": 551736,
+ "fileID": 4731947,
+ "required": true
+ },
+ {
+ "projectID": 531761,
+ "fileID": 5140912,
+ "required": true
+ },
+ {
+ "projectID": 270441,
+ "fileID": 5274678,
+ "required": true
+ },
+ {
+ "projectID": 820815,
+ "fileID": 5046696,
+ "required": true
+ },
+ {
+ "projectID": 940350,
+ "fileID": 5313702,
+ "required": true
+ },
+ {
+ "projectID": 537533,
+ "fileID": 5365335,
+ "required": true
+ },
+ {
+ "projectID": 828656,
+ "fileID": 4932788,
+ "required": true
+ },
+ {
+ "projectID": 622112,
+ "fileID": 5320730,
+ "required": true
+ },
+ {
+ "projectID": 251407,
+ "fileID": 4751740,
+ "required": true
+ },
+ {
+ "projectID": 676136,
+ "fileID": 5200949,
+ "required": true
+ },
+ {
+ "projectID": 292038,
+ "fileID": 4594106,
+ "required": true
+ },
+ {
+ "projectID": 499096,
+ "fileID": 5224988,
+ "required": true
+ },
+ {
+ "projectID": 686911,
+ "fileID": 5389318,
+ "required": true
+ },
+ {
+ "projectID": 429235,
+ "fileID": 4810975,
+ "required": true
+ },
+ {
+ "projectID": 550678,
+ "fileID": 4627738,
+ "required": true
+ },
+ {
+ "projectID": 297038,
+ "fileID": 5290583,
+ "required": true
+ },
+ {
+ "projectID": 880630,
+ "fileID": 5278184,
+ "required": true
+ },
+ {
+ "projectID": 688231,
+ "fileID": 5331300,
+ "required": true
+ },
+ {
+ "projectID": 429926,
+ "fileID": 4755295,
+ "required": true
+ },
+ {
+ "projectID": 283644,
+ "fileID": 5098182,
+ "required": true
+ },
+ {
+ "projectID": 367706,
+ "fileID": 5340225,
+ "required": true
+ },
+ {
+ "projectID": 435044,
+ "fileID": 4596768,
+ "required": true
+ },
+ {
+ "projectID": 922713,
+ "fileID": 5366124,
+ "required": true
+ },
+ {
+ "projectID": 570630,
+ "fileID": 5096206,
+ "required": true
+ },
+ {
+ "projectID": 492574,
+ "fileID": 4580511,
"required": true
},
{
@@ -766,8 +616,148 @@
"required": true
},
{
- "projectID": 499096,
- "fileID": 5224988,
+ "projectID": 511770,
+ "fileID": 5117077,
+ "required": true
+ },
+ {
+ "projectID": 470013,
+ "fileID": 4923669,
+ "required": true
+ },
+ {
+ "projectID": 880532,
+ "fileID": 5331987,
+ "required": true
+ },
+ {
+ "projectID": 459701,
+ "fileID": 4766090,
+ "required": true
+ },
+ {
+ "projectID": 431430,
+ "fileID": 4731559,
+ "required": true
+ },
+ {
+ "projectID": 892005,
+ "fileID": 5386563,
+ "required": true
+ },
+ {
+ "projectID": 309927,
+ "fileID": 5367944,
+ "required": true
+ },
+ {
+ "projectID": 354353,
+ "fileID": 4891706,
+ "required": true
+ },
+ {
+ "projectID": 316582,
+ "fileID": 5157034,
+ "required": true
+ },
+ {
+ "projectID": 670986,
+ "fileID": 5093785,
+ "required": true
+ },
+ {
+ "projectID": 419699,
+ "fileID": 5137938,
+ "required": true
+ },
+ {
+ "projectID": 300331,
+ "fileID": 4832944,
+ "required": true
+ },
+ {
+ "projectID": 260262,
+ "fileID": 5393183,
+ "required": true
+ },
+ {
+ "projectID": 306770,
+ "fileID": 4966125,
+ "required": true
+ },
+ {
+ "projectID": 513402,
+ "fileID": 5394097,
+ "required": true
+ },
+ {
+ "projectID": 387638,
+ "fileID": 4691333,
+ "required": true
+ },
+ {
+ "projectID": 240633,
+ "fileID": 4655091,
+ "required": true
+ },
+ {
+ "projectID": 938643,
+ "fileID": 5109692,
+ "required": true
+ },
+ {
+ "projectID": 930207,
+ "fileID": 5302292,
+ "required": true
+ },
+ {
+ "projectID": 416294,
+ "fileID": 4944325,
+ "required": true
+ },
+ {
+ "projectID": 1003785,
+ "fileID": 5310649,
+ "required": true
+ },
+ {
+ "projectID": 317780,
+ "fileID": 5262424,
+ "required": true
+ },
+ {
+ "projectID": 223794,
+ "fileID": 5388205,
+ "required": true
+ },
+ {
+ "projectID": 663658,
+ "fileID": 5326142,
+ "required": true
+ },
+ {
+ "projectID": 559313,
+ "fileID": 4869749,
+ "required": true
+ },
+ {
+ "projectID": 282001,
+ "fileID": 5379173,
+ "required": true
+ },
+ {
+ "projectID": 266890,
+ "fileID": 5271584,
+ "required": true
+ },
+ {
+ "projectID": 580555,
+ "fileID": 5311316,
+ "required": true
+ },
+ {
+ "projectID": 952112,
+ "fileID": 5064493,
"required": true
}
],
diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html
index 3746878f8..7749cc1d3 100644
--- a/.github/buildtools/modpack/modlist.html
+++ b/.github/buildtools/modpack/modlist.html
@@ -1,153 +1,151 @@
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b247b0a64..a77314608 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -233,9 +233,24 @@ jobs:
# server-display-name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server
# release-type: ${{ env.RELEASE_TYPE }}
+ close-fixed-issues:
+ name: Close Fixed Issues
+ needs: [info, build-cf, build-mmc, build-server]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4.1.6
+
+ - name: Сlose fixed in dev
+ uses: Xikaro/close-issues-based-on-label@master
+ env:
+ LABEL: "2. Status: Fixed in Dev"
+ COMMENT: fixed in ${{ needs.info.outputs.project_version }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
release-github:
name: Deploy to GitHub
- needs: [info, build-cf, build-mmc, build-server]
+ needs: [info, build-cf, build-mmc, build-server, close-fixed-issues]
runs-on: ubuntu-latest
steps:
- name: Download modpack
@@ -280,22 +295,4 @@ jobs:
** Сhangelog **
```${{ needs.info.outputs.changelog }}```
** [More details...](https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x/blob/main/CHANGELOG.md) **
- embed-color: 5814783
-
- # close-fixed-issues:
- # name: Close Fixed Issues
- # needs: [info, release-github, release-curseforge]
- # runs-on: ubuntu-latest
- # steps:
- # - name: Checkout
- # uses: actions/checkout@v4.1.4
-
- # - name: Сlose fixed in dev
- # uses: juraj-hrivnak/close-issues-based-on-label@master
- # env:
- # LABEL: "2. Status: Fixed in Dev"
- # VERSION: ${{ needs.info.outputs.project_version }}
- # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-
+ embed-color: 5814783
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7d1c0f56..2914bf0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,59 @@
# Changelog
-## [Unreleased]
-### Fixes
-- Probably fixed strange shit, when items could dispawn VERY quickly (1-2mins) (by deleting KryptonReforged as incompat with embeddium).
-### New mods
-- ?
+## [0.7.12] - 03.06.2024
+### Changes
+- Small fixes in quests. (FriendlyCube)
+- The version of the Falling Tree's has been rolled back because it sometimes crashes, the developer has been notified.
+- Added AE2 quest line. (Friendly Cube)
+- ExtendedAE and Mega Cells recipes have been added and changed. (Friendly Cube)
+### Updated mods
+- Panda's Falling Tree's 0.12.1 -> 0.12
+
+## [0.7.11] - 03.06.2024
+### Updated mods
+- Packet Fixer 1.4.0 -> 1.3.2
+
+## [0.7.10] - 03.06.2024
+### Changes
+- Probably fixed strange shit, when items could dispawn VERY quickly. (1-2mins) (by deleting KryptonReforged as incompat with embeddium)
+- Fixed a situation where quests could not be counted immediately after completing the quest conditions. (by deleteing FTBQuestsOptimizer)
+- Fixed loom recipe of WoolPotholder from TFC Hot Or Not, which is duplicating with wool recipe.
+- Fixed a bug, when TFC Guide Book not working, (yes, its was a bug).
+- Updated Quests For Primitive Age. (BabBimmaBome)
+### New Mods
+- Shimmer
### Updated mods
- GregTech Modern 1.2.0.a -> 1.2.3
-- TerraFirmaGreg 0.5.6 -> 0.5.7
+- TerraFirmaGreg 0.5.6 -> 0.5.9
- GCYR 0.1.6 -> 0.1.8
+- Appliedenergistics2 15.1.1 -> 15.2.2
+- CC-Tweaked 1.110.3 -> 1.111.0
+- Create Connected 0.7.4 -> 0.8.2
+- CreativeCore 2.11.28 -> 2.11.30
+- Curios 5.9.0 -> 5.9.1
+- EnhancedVisuals 1.7.2 -> 1.8.1
+- Etched 3.0.1 -> 3.0.2
+- Exposure 1.5.1 -> 1.6.0
+- ExtendedAE 1.1.4 -> 1.1.8
+- Fallingtrees 0.12 -> 0.12.1
+- Fancymenu 3.1.2 -> 3.2.3
+- First Person 2.4.0 -> 2.4.1
+- FTB-Quests 2001.4.4 -> 2001.4.5
+- ImmediatelyFast 1.2.15 -> 1.2.17
+- Jade 11.9.2 -> 11.9.3
+- Ksyxis 1.3.0 -> 1.3.1
+- Let Me Despawn 1.2.0 -> 1.2.1
+- Mega Cells 2.3.5 -> 2.4.4
+- Moonlight 2.11.31 -> 2.11.28
+- Packet Fixer 1.3.2 -> 1.4.0
+- PuzzlesLib 8.1.19 -> 8.1.20
+- Steam_Rails 1.6.3 -> 1.6.4
+- ToolBelt 1.20.0 -> 1.20.01
+- YetAnotherConfigLib 3.4.2 -> 3.4.4
### Removed mods
- KryptonReforged
+- FTBQuestsOptimizer
+- Rrls
## [0.7.9] - 22.05.2024
### Fixes
diff --git a/blueprints/speeedcraft/pack.json b/blueprints/speeedcraft/pack.json
deleted file mode 100644
index 1070259ee..000000000
--- a/blueprints/speeedcraft/pack.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"pack-format":1,"desc":"This is your local Structurepack. This is where all your scans go.","authors":["SpeeeDCraft"],"mods":["structurize"],"name":"SpeeeDCraft","icon":""}
\ No newline at end of file
diff --git a/config/Advancedperipherals/world.toml b/config/Advancedperipherals/world.toml
index 3b2b5cdf7..3b4d52c0b 100644
--- a/config/Advancedperipherals/world.toml
+++ b/config/Advancedperipherals/world.toml
@@ -4,7 +4,7 @@
#Enable the villager structures for the computer scientist.
enableVillagerStructures = true
#Gives the ap documentation to new players.
- givePlayerBookOnJoin = true
+ givePlayerBookOnJoin = false
#The weight of the villager structures.
#Range: 0 ~ 16000
villagerStructureWeight = 10
diff --git a/config/create_connected-common.toml b/config/create_connected-common.toml
index 05044de17..055dc7bf0 100644
--- a/config/create_connected-common.toml
+++ b/config/create_connected-common.toml
@@ -8,7 +8,6 @@ migrateCopycatsOnInitialize = false
#.
#Enable/disable features. Values on server override clients
[features]
- #.
bamboo_window = false
item_silo = true
inverted_clutch = true
@@ -35,4 +34,9 @@ migrateCopycatsOnInitialize = false
copycat_beam = false
copycat_board = false
copycat_fence = false
+ #.
+ fluid_vessel = true
+ large_crank_wheel = true
+ crank_wheel = true
+ fan_freezing_catalyst = true
diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt
index e2fb72c38..c204397fc 100644
--- a/config/ftbquests/quests/chapters/ae2.snbt
+++ b/config/ftbquests/quests/chapters/ae2.snbt
@@ -431,7 +431,7 @@
item: "ae2:annihilation_plane"
type: "item"
}]
- x: 5.0d
+ x: 6.5d
y: -2.0d
}
{
@@ -442,7 +442,7 @@
item: "ae2:formation_plane"
type: "item"
}]
- x: 5.0d
+ x: 6.5d
y: 2.0d
}
{
@@ -457,7 +457,7 @@
item: "ae2:interface"
type: "item"
}]
- x: 5.0d
+ x: 6.5d
y: 0.0d
}
{
@@ -468,7 +468,7 @@
item: "ae2:storage_bus"
type: "item"
}]
- x: 6.5d
+ x: 8.0d
y: 0.0d
}
{
@@ -480,7 +480,7 @@
item: "ae2:molecular_assembler"
type: "item"
}]
- x: 8.0d
+ x: 9.5d
y: 0.0d
}
{
@@ -492,7 +492,7 @@
item: "ae2:crafting_unit"
type: "item"
}]
- x: 9.5d
+ x: 11.0d
y: 0.0d
}
{
@@ -504,7 +504,7 @@
item: "ae2:1k_crafting_storage"
type: "item"
}]
- x: 12.0d
+ x: 13.5d
y: -2.0d
}
{
@@ -516,7 +516,7 @@
item: "ae2:4k_crafting_storage"
type: "item"
}]
- x: 12.0d
+ x: 13.5d
y: -1.0d
}
{
@@ -528,7 +528,7 @@
item: "ae2:16k_crafting_storage"
type: "item"
}]
- x: 12.0d
+ x: 13.5d
y: 0.0d
}
{
@@ -540,7 +540,7 @@
item: "ae2:64k_crafting_storage"
type: "item"
}]
- x: 12.0d
+ x: 13.5d
y: 1.0d
}
{
@@ -552,7 +552,7 @@
item: "ae2:256k_crafting_storage"
type: "item"
}]
- x: 12.0d
+ x: 13.5d
y: 2.0d
}
{
@@ -564,7 +564,7 @@
item: "ae2:crafting_accelerator"
type: "item"
}]
- x: 9.5d
+ x: 11.0d
y: -2.0d
}
{
@@ -576,7 +576,7 @@
item: "ae2:crafting_monitor"
type: "item"
}]
- x: 9.5d
+ x: 11.0d
y: 2.0d
}
{
@@ -773,30 +773,52 @@
type: "item"
}]
x: -3.0d
- y: 9.5d
+ y: 8.5d
}
{
dependencies: ["3E0EE1623F16A15A"]
+ description: [
+ "Cell Dock:"
+ ""
+ "1 slot "
+ "Passive Drain: 1 eu/t"
+ ""
+ ""
+ "ME Drive:"
+ ""
+ "10 slot"
+ "Passive Drain: 4 eu/t"
+ ]
id: "7FE61D03A7F15A6F"
shape: "circle"
tasks: [{
- id: "4CA2AFDCC398E43B"
- item: "ae2:drive"
+ id: "2A7C25B62FAA81D9"
+ item: {
+ Count: 1
+ id: "ftbfiltersystem:smart_filter"
+ tag: {
+ display: {
+ Name: "{\"text\":\"Any start driver\"}"
+ }
+ "ftbfiltersystem:filter": "or(item(ae2:drive)item(megacells:cell_dock))"
+ }
+ }
type: "item"
}]
- x: -0.5d
+ x: 0.0d
y: 11.0d
}
{
dependencies: ["7FE61D03A7F15A6F"]
id: "0DD7D344F65BB09F"
shape: "circle"
+ subtitle: "Passive Drain: 2eu/t"
tasks: [{
id: "43B5F598E59DC820"
item: "ae2:io_port"
type: "item"
}]
- x: 1.0d
+ x: 2.0d
y: 11.0d
}
{
@@ -815,7 +837,7 @@
type: "item"
}
]
- x: -1.5d
+ x: -2.0d
y: 11.0d
}
{
@@ -827,7 +849,7 @@
item: "ae2:spatial_cell_component_2"
type: "item"
}]
- x: -1.5d
+ x: -4.0d
y: 12.5d
}
{
@@ -839,7 +861,7 @@
item: "ae2:spatial_cell_component_16"
type: "item"
}]
- x: -1.5d
+ x: -4.0d
y: 13.5d
}
{
@@ -851,7 +873,7 @@
item: "ae2:spatial_cell_component_128"
type: "item"
}]
- x: -1.5d
+ x: -4.0d
y: 14.5d
}
{
@@ -863,7 +885,7 @@
item: "ae2:spatial_storage_cell_2"
type: "item"
}]
- x: -3.0d
+ x: -5.5d
y: 12.5d
}
{
@@ -875,7 +897,7 @@
item: "ae2:spatial_storage_cell_16"
type: "item"
}]
- x: -3.0d
+ x: -5.5d
y: 13.5d
}
{
@@ -887,7 +909,7 @@
item: "ae2:spatial_storage_cell_128"
type: "item"
}]
- x: -3.0d
+ x: -5.5d
y: 14.5d
}
{
@@ -899,7 +921,7 @@
item: "ae2:wireless_access_point"
type: "item"
}]
- x: -0.5d
+ x: 0.0d
y: 12.5d
}
{
@@ -911,7 +933,7 @@
item: "ae2:wireless_booster"
type: "item"
}]
- x: 1.0d
+ x: 2.0d
y: 12.5d
}
{
@@ -923,7 +945,7 @@
item: "ae2:wireless_terminal"
type: "item"
}]
- x: 5.5d
+ x: 6.0d
y: 12.5d
}
{
@@ -939,7 +961,7 @@
}
type: "item"
}]
- x: 7.5d
+ x: 8.0d
y: 11.5d
}
{
@@ -951,7 +973,7 @@
item: "ae2wtlib:wireless_pattern_encoding_terminal"
type: "item"
}]
- x: 7.5d
+ x: 8.0d
y: 13.5d
}
{
@@ -968,7 +990,7 @@
item: "ae2wtlib:wireless_universal_terminal"
type: "item"
}]
- x: 9.5d
+ x: 10.0d
y: 12.5d
}
{
@@ -980,7 +1002,7 @@
item: "ae2wtlib:quantum_bridge_card"
type: "item"
}]
- x: 1.5d
+ x: 2.5d
y: 14.5d
}
{
@@ -992,7 +1014,7 @@
item: "ae2wtlib:magnet_card"
type: "item"
}]
- x: 0.5d
+ x: 1.5d
y: 14.5d
}
{
@@ -1004,7 +1026,7 @@
item: "ae2wtlib:wireless_pattern_access_terminal"
type: "item"
}]
- x: 7.5d
+ x: 8.0d
y: 12.5d
}
{
@@ -1016,7 +1038,7 @@
item: "ae2:item_cell_housing"
type: "item"
}]
- x: -3.5d
+ x: -4.0d
y: 6.0d
}
{
@@ -1028,7 +1050,7 @@
item: "ae2:fluid_cell_housing"
type: "item"
}]
- x: -3.5d
+ x: -4.0d
y: 8.0d
}
{
@@ -1044,7 +1066,7 @@
item: "ae2:cell_component_1k"
type: "item"
}]
- x: -5.5d
+ x: -6.0d
y: 7.0d
}
{
@@ -1057,7 +1079,7 @@
item: "ae2:cell_component_4k"
type: "item"
}]
- x: -6.5d
+ x: -7.0d
y: 7.0d
}
{
@@ -1070,7 +1092,7 @@
item: "ae2:cell_component_16k"
type: "item"
}]
- x: -7.5d
+ x: -8.0d
y: 7.0d
}
{
@@ -1083,7 +1105,7 @@
item: "ae2:cell_component_64k"
type: "item"
}]
- x: -8.5d
+ x: -9.0d
y: 7.0d
}
{
@@ -1096,7 +1118,7 @@
item: "ae2:cell_component_256k"
type: "item"
}]
- x: -9.5d
+ x: -10.0d
y: 7.0d
}
{
@@ -1112,7 +1134,7 @@
}
type: "item"
}]
- x: -9.5d
+ x: -10.0d
y: 5.5d
}
{
@@ -1128,7 +1150,7 @@
}
type: "item"
}]
- x: -9.5d
+ x: -10.0d
y: 8.5d
}
{
@@ -1144,7 +1166,7 @@
}
type: "item"
}]
- x: -10.0d
+ x: -10.5d
y: 4.5d
}
{
@@ -1160,7 +1182,7 @@
}
type: "item"
}]
- x: -10.0d
+ x: -10.5d
y: 9.5d
}
{
@@ -1176,7 +1198,7 @@
}
type: "item"
}]
- x: -8.5d
+ x: -9.0d
y: 5.5d
}
{
@@ -1192,7 +1214,7 @@
}
type: "item"
}]
- x: -8.5d
+ x: -9.0d
y: 8.5d
}
{
@@ -1208,7 +1230,7 @@
}
type: "item"
}]
- x: -9.0d
+ x: -9.5d
y: 4.5d
}
{
@@ -1224,7 +1246,7 @@
}
type: "item"
}]
- x: -9.0d
+ x: -9.5d
y: 9.5d
}
{
@@ -1240,7 +1262,7 @@
}
type: "item"
}]
- x: -7.5d
+ x: -8.0d
y: 8.5d
}
{
@@ -1256,7 +1278,7 @@
}
type: "item"
}]
- x: -7.5d
+ x: -8.0d
y: 5.5d
}
{
@@ -1272,7 +1294,7 @@
}
type: "item"
}]
- x: -8.0d
+ x: -8.5d
y: 4.5d
}
{
@@ -1288,7 +1310,7 @@
}
type: "item"
}]
- x: -8.0d
+ x: -8.5d
y: 9.5d
}
{
@@ -1304,7 +1326,7 @@
}
type: "item"
}]
- x: -6.5d
+ x: -7.0d
y: 5.5d
}
{
@@ -1320,7 +1342,7 @@
}
type: "item"
}]
- x: -6.5d
+ x: -7.0d
y: 8.5d
}
{
@@ -1336,7 +1358,7 @@
}
type: "item"
}]
- x: -7.0d
+ x: -7.5d
y: 4.5d
}
{
@@ -1352,7 +1374,7 @@
}
type: "item"
}]
- x: -7.0d
+ x: -7.5d
y: 9.5d
}
{
@@ -1368,7 +1390,7 @@
}
type: "item"
}]
- x: -5.5d
+ x: -6.0d
y: 5.5d
}
{
@@ -1384,7 +1406,7 @@
}
type: "item"
}]
- x: -5.5d
+ x: -6.0d
y: 8.5d
}
{
@@ -1400,7 +1422,7 @@
}
type: "item"
}]
- x: -6.0d
+ x: -6.5d
y: 4.5d
}
{
@@ -1416,7 +1438,7 @@
}
type: "item"
}]
- x: -6.0d
+ x: -6.5d
y: 9.5d
}
{
@@ -1439,7 +1461,7 @@
item: "ae2insertexportcard:insert_card"
type: "item"
}]
- x: 3.5d
+ x: 5.0d
y: 11.5d
}
{
@@ -1450,7 +1472,7 @@
item: "ae2insertexportcard:export_card"
type: "item"
}]
- x: 3.5d
+ x: 5.0d
y: 13.5d
}
{
@@ -1466,7 +1488,7 @@
}
type: "item"
}]
- x: -3.0d
+ x: -4.0d
y: 11.0d
}
{
@@ -1482,7 +1504,7 @@
}
type: "item"
}]
- x: -4.5d
+ x: -5.5d
y: 11.0d
}
{
@@ -1498,7 +1520,7 @@
}
type: "item"
}]
- x: -6.0d
+ x: -7.0d
y: 11.0d
}
{
@@ -1509,11 +1531,15 @@
item: "merequester:requester"
type: "item"
}]
- x: 6.5d
+ x: 8.0d
y: 2.0d
}
{
- dependencies: ["10A45BEBBEA7A466"]
+ dependencies: [
+ "0C8649DF8EECC311"
+ "4493C81ABD3BFC00"
+ ]
+ dependency_requirement: "one_completed"
id: "58A223FCB61A60E9"
shape: "circle"
tasks: [{
@@ -1521,7 +1547,7 @@
item: "megacells:cell_component_1m"
type: "item"
}]
- x: -10.5d
+ x: -13.0d
y: 7.0d
}
{
@@ -1533,43 +1559,47 @@
item: "megacells:cell_component_4m"
type: "item"
}]
- x: -11.5d
+ x: -14.0d
y: 7.0d
}
{
dependencies: ["2017A13C254711F7"]
+ description: [""]
id: "1B44E57DAE367873"
shape: "circle"
+ subtitle: "in dev"
tasks: [{
id: "408DDCC9B2573DA9"
item: "megacells:cell_component_16m"
type: "item"
}]
- x: -12.5d
+ x: -15.0d
y: 7.0d
}
{
dependencies: ["1B44E57DAE367873"]
id: "5598720FF2E9F946"
shape: "circle"
+ subtitle: "in dev"
tasks: [{
id: "773358A900F41158"
item: "megacells:cell_component_64m"
type: "item"
}]
- x: -13.5d
+ x: -16.0d
y: 7.0d
}
{
dependencies: ["5598720FF2E9F946"]
id: "416DB5C77D43FE29"
shape: "circle"
+ subtitle: "in dev"
tasks: [{
id: "721A317945FAF3C7"
item: "megacells:cell_component_256m"
type: "item"
}]
- x: -14.5d
+ x: -17.0d
y: 7.0d
}
{
@@ -1584,7 +1614,7 @@
}
type: "item"
}]
- x: -10.5d
+ x: -13.0d
y: 5.5d
}
{
@@ -1599,7 +1629,7 @@
}
type: "item"
}]
- x: -11.5d
+ x: -14.0d
y: 5.5d
}
{
@@ -1614,7 +1644,7 @@
}
type: "item"
}]
- x: -12.5d
+ x: -15.0d
y: 5.5d
}
{
@@ -1629,7 +1659,7 @@
}
type: "item"
}]
- x: -13.5d
+ x: -16.0d
y: 5.5d
}
{
@@ -1644,7 +1674,7 @@
}
type: "item"
}]
- x: -14.5d
+ x: -17.0d
y: 5.5d
}
{
@@ -1659,7 +1689,7 @@
}
type: "item"
}]
- x: -10.5d
+ x: -13.0d
y: 8.5d
}
{
@@ -1674,7 +1704,7 @@
}
type: "item"
}]
- x: -11.5d
+ x: -14.0d
y: 8.5d
}
{
@@ -1689,7 +1719,7 @@
}
type: "item"
}]
- x: -12.5d
+ x: -15.0d
y: 8.5d
}
{
@@ -1704,7 +1734,7 @@
}
type: "item"
}]
- x: -13.5d
+ x: -16.0d
y: 8.5d
}
{
@@ -1719,7 +1749,7 @@
}
type: "item"
}]
- x: -14.5d
+ x: -17.0d
y: 8.5d
}
{
@@ -1734,7 +1764,7 @@
}
type: "item"
}]
- x: -11.0d
+ x: -13.5d
y: 4.5d
}
{
@@ -1749,7 +1779,7 @@
}
type: "item"
}]
- x: -12.0d
+ x: -14.5d
y: 4.5d
}
{
@@ -1764,7 +1794,7 @@
}
type: "item"
}]
- x: -13.0d
+ x: -15.5d
y: 4.5d
}
{
@@ -1779,7 +1809,7 @@
}
type: "item"
}]
- x: -14.0d
+ x: -16.5d
y: 4.5d
}
{
@@ -1794,7 +1824,7 @@
}
type: "item"
}]
- x: -15.0d
+ x: -17.5d
y: 4.5d
}
{
@@ -1809,7 +1839,7 @@
}
type: "item"
}]
- x: -11.0d
+ x: -13.5d
y: 9.5d
}
{
@@ -1824,7 +1854,7 @@
}
type: "item"
}]
- x: -12.0d
+ x: -14.5d
y: 9.5d
}
{
@@ -1839,7 +1869,7 @@
}
type: "item"
}]
- x: -13.0d
+ x: -15.5d
y: 9.5d
}
{
@@ -1854,7 +1884,7 @@
}
type: "item"
}]
- x: -14.0d
+ x: -16.5d
y: 9.5d
}
{
@@ -1869,7 +1899,7 @@
}
type: "item"
}]
- x: -15.0d
+ x: -17.5d
y: 9.5d
}
{
@@ -1880,8 +1910,8 @@
item: "merequester:requester_terminal"
type: "item"
}]
- x: 6.5d
- y: 4.0d
+ x: 9.5d
+ y: 2.0d
}
{
dependencies: ["1D88369409736DC7"]
@@ -1901,6 +1931,377 @@
x: -7.0d
y: 2.0d
}
+ {
+ dependencies: ["10A45BEBBEA7A466"]
+ id: "4493C81ABD3BFC00"
+ tasks: [{
+ id: "770A039BEF516A07"
+ item: "megacells:mega_item_cell_housing"
+ type: "item"
+ }]
+ x: -11.5d
+ y: 6.0d
+ }
+ {
+ dependencies: ["10A45BEBBEA7A466"]
+ id: "0C8649DF8EECC311"
+ tasks: [{
+ id: "33A8D4B45535C9BB"
+ item: "megacells:mega_fluid_cell_housing"
+ type: "item"
+ }]
+ x: -11.5d
+ y: 8.0d
+ }
+ {
+ dependencies: ["584A8C2697AE1785"]
+ id: "4398318850154CEA"
+ tasks: [{
+ id: "76971A70F6196C15"
+ item: "megacells:accumulation_processor_press"
+ type: "item"
+ }]
+ x: 8.0d
+ y: 6.0d
+ }
+ {
+ dependencies: ["3E0EE1623F16A15A"]
+ id: "11C66CC52784686D"
+ tasks: [{
+ id: "1C5609179AFD0241"
+ item: "ae2:condenser"
+ type: "item"
+ }]
+ x: -3.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["11C66CC52784686D"]
+ hide_dependency_lines: true
+ id: "584A8C2697AE1785"
+ size: 1.5d
+ tasks: [{
+ id: "17690B31AD36C391"
+ item: "ae2:singularity"
+ type: "item"
+ }]
+ x: 7.0d
+ y: 5.0d
+ }
+ {
+ dependencies: ["4398318850154CEA"]
+ id: "19C5C349EABFB29A"
+ shape: "gear"
+ size: 1.5d
+ tasks: [{
+ id: "328DB303390420FF"
+ item: "megacells:accumulation_processor"
+ type: "item"
+ }]
+ x: 9.0d
+ y: 7.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "3B9319944B47F3F2"
+ tasks: [{
+ id: "7D0A890D749CAAC1"
+ item: "megacells:mega_interface"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 4.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "76A7B49D92CE5EB5"
+ tasks: [{
+ id: "3B083B4DE93D31B8"
+ item: "megacells:mega_pattern_provider"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 5.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "6D1FC61E12586D57"
+ tasks: [{
+ id: "449FBA81C0A6A9B8"
+ item: "expatternprovider:ex_molecular_assembler"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 6.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "3D1933DCABD4006C"
+ tasks: [{
+ id: "19595D59E5DCA829"
+ item: "expatternprovider:ex_drive"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 7.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "63963147516C1F74"
+ tasks: [
+ {
+ id: "7BC071B7030C4E92"
+ item: "expatternprovider:wireless_connect"
+ type: "item"
+ }
+ {
+ id: "67E6562A9129D610"
+ item: "expatternprovider:wireless_tool"
+ type: "item"
+ }
+ ]
+ x: 11.0d
+ y: 8.0d
+ }
+ {
+ dependencies: ["76A7B49D92CE5EB5"]
+ id: "1FB2089C461BD7F5"
+ tasks: [{
+ id: "310078097905E96C"
+ item: "expatternprovider:ex_pattern_provider"
+ type: "item"
+ }]
+ x: 13.5d
+ y: 5.0d
+ }
+ {
+ dependencies: ["3B9319944B47F3F2"]
+ id: "1269F30575599F10"
+ tasks: [{
+ id: "2337DF0CD810234D"
+ item: "expatternprovider:ex_interface"
+ type: "item"
+ }]
+ x: 13.5d
+ y: 4.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "62B7FDDFF8BCF21D"
+ tasks: [{
+ id: "5CE7A2C50EEC5C93"
+ item: "expatternprovider:ex_charger"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 9.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "7A3B42320B7CCFE6"
+ tasks: [{
+ id: "6D66049C31E56F07"
+ item: "expatternprovider:ex_io_port"
+ type: "item"
+ }]
+ x: 11.0d
+ y: 10.0d
+ }
+ {
+ dependencies: [
+ "5CAF4D91F281D3BC"
+ "780DB1BBED7236C3"
+ ]
+ id: "26CF84B52F34D2B6"
+ tasks: [{
+ id: "5A86009CAD7F0191"
+ item: "ae2:pattern_provider"
+ type: "item"
+ }]
+ x: 5.0d
+ y: 0.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "0BF8CB9EAD275C6F"
+ tasks: [{
+ id: "0F4DFF44A5A3C878"
+ item: "megacells:mega_crafting_unit"
+ type: "item"
+ }]
+ x: 7.0d
+ y: 8.5d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "6BD1291E8D186C25"
+ tasks: [{
+ id: "136B2E4ED7C83291"
+ item: "megacells:mega_crafting_monitor"
+ type: "item"
+ }]
+ x: 5.0d
+ y: 7.0d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "29020780E7445FBB"
+ tasks: [{
+ id: "464E42D2A0CE7294"
+ item: "megacells:mega_crafting_accelerator"
+ type: "item"
+ }]
+ x: 5.0d
+ y: 8.5d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "10C7EB316BAE2485"
+ tasks: [{
+ id: "011441417935728E"
+ item: "megacells:1m_crafting_storage"
+ type: "item"
+ }]
+ x: 5.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "227D4D5B19AA6CE5"
+ tasks: [{
+ id: "037F173440F5374A"
+ item: "megacells:4m_crafting_storage"
+ type: "item"
+ }]
+ x: 6.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "6C1609F45168FE27"
+ subtitle: "in dev"
+ tasks: [{
+ id: "0A7525D4C945C8EA"
+ item: "megacells:16m_crafting_storage"
+ type: "item"
+ }]
+ x: 7.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "7233C77CE9F2C8D2"
+ subtitle: "in dev"
+ tasks: [{
+ id: "519B6D77D18C5D38"
+ item: "megacells:64m_crafting_storage"
+ type: "item"
+ }]
+ x: 8.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["0BF8CB9EAD275C6F"]
+ id: "5F8609C9F73D880E"
+ subtitle: "in dev"
+ tasks: [{
+ id: "497F303F52FAAF76"
+ item: "megacells:256m_crafting_storage"
+ type: "item"
+ }]
+ x: 9.0d
+ y: 10.0d
+ }
+ {
+ dependencies: [
+ "22262840D8FB66F6"
+ "19C5C349EABFB29A"
+ ]
+ hide_dependency_lines: true
+ id: "175FDA9A221D9890"
+ tasks: [{
+ id: "638E87603393DE86"
+ item: "expatternprovider:ex_pattern_access_part"
+ type: "item"
+ }]
+ x: 0.5d
+ y: -9.5d
+ }
+ {
+ dependencies: ["6E2F0F0D9E5BA86D"]
+ id: "5190700FE8C07694"
+ tasks: [{
+ id: "18A7C8EBFACD3112"
+ item: "expatternprovider:threshold_level_emitter"
+ type: "item"
+ }]
+ x: 3.0d
+ y: -4.0d
+ }
+ {
+ dependencies: [
+ "265776278F5E3F33"
+ "10C1BEE45AFA6A83"
+ ]
+ id: "76FC803DD55B1761"
+ tasks: [{
+ id: "3F7DAEC6A2777B7F"
+ item: "expatternprovider:caner"
+ type: "item"
+ }]
+ x: 1.5d
+ y: 0.0d
+ }
+ {
+ dependencies: ["4248E24FE441B11D"]
+ id: "2E98E8200E671A9E"
+ tasks: [{
+ id: "38CA224074DD3ECD"
+ item: "expatternprovider:ingredient_buffer"
+ type: "item"
+ }]
+ x: 8.0d
+ y: -2.0d
+ }
+ {
+ dependencies: ["3E0EE1623F16A15A"]
+ id: "2948E38F4C54FEEE"
+ tasks: [{
+ id: "08D8B91E8678418D"
+ item: {
+ Count: 1
+ id: "expatternprovider:me_packing_tape"
+ tag: {
+ Damage: 0
+ }
+ }
+ type: "item"
+ }]
+ x: -1.0d
+ y: 10.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "7DBBCCF58C57B19F"
+ tasks: [{
+ id: "279A24F6BF43AC91"
+ item: "expatternprovider:ex_import_bus_part"
+ type: "item"
+ }]
+ x: 9.5d
+ y: 4.0d
+ }
+ {
+ dependencies: ["19C5C349EABFB29A"]
+ id: "586CA6482ABA61D3"
+ tasks: [{
+ id: "3B80592841923619"
+ item: "expatternprovider:ex_export_bus_part"
+ type: "item"
+ }]
+ x: 8.5d
+ y: 4.0d
+ }
]
title: "&6HV&r - AE2"
}
diff --git a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
index 6a1d28c6c..a328e0bac 100644
--- a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
+++ b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
@@ -67,25 +67,6 @@
}
]
quests: [
- {
- dependencies: [
- "78277DBC07D3C45C"
- "1783D89CE81C8E2E"
- ]
- description: ["The &aAdvanced Processing Array&r is an upgrade to the regular version. It can now handle a maximum of &a64&r machines, instead of 16."]
- id: "4194EC9F1C6632E4"
- shape: "rsquare"
- size: 0.66d
- subtitle: "Your blue cube is now green!"
- tasks: [{
- id: "356EC5387BA79103"
- item: "gtceu:luv_processing_array"
- type: "item"
- }]
- title: "Advanced Processing Array"
- x: 1.125d
- y: 0.0d
- }
{
dependencies: [
"77B7B1EDD19831E0"
diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
index 614b2eea3..346dac36c 100644
--- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
+++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
@@ -1532,6 +1532,7 @@
"575B07D390D9D079"
"05ADBAE5B6F38956"
]
+ dependency_requirement: "one_completed"
description: [
"Before we start, here's some important information if you're aiming to make Ethylene:"
""
diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt
index 8bedc65d3..f49a02006 100644
--- a/config/ftbquests/quests/chapters/primitive_age.snbt
+++ b/config/ftbquests/quests/chapters/primitive_age.snbt
@@ -1127,7 +1127,7 @@
description: ["Hammer: mainly used only to create a stone anvil and the first copper double ingots, but there will be information about this later in the quests."]
hide_dependency_lines: true
id: "120E5C0E43EC756B"
- subtitle: "Сделайте лучше медный!"
+ subtitle: "Make a better copper one!"
tasks: [{
id: "4BD017E2BEB690C4"
item: {
@@ -2304,7 +2304,7 @@
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
- "ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite))"
+ "ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite)item(gtceu:crushed_yellow_limonite_ore))"
}
}
title: "Any Iron Ore"
diff --git a/config/letmedespawn.json b/config/letmedespawn.json
new file mode 100644
index 000000000..0dd57cd81
--- /dev/null
+++ b/config/letmedespawn.json
@@ -0,0 +1,3 @@
+{
+ "mobNames": []
+}
\ No newline at end of file
diff --git a/config/shimmer-client.toml b/config/shimmer-client.toml
new file mode 100644
index 000000000..e0e841185
--- /dev/null
+++ b/config/shimmer-client.toml
@@ -0,0 +1,30 @@
+#setting UBO offset
+#-1 for auto setting
+#maximum is limited by your gpu,the OpenGL constant:GL_MAX_UNIFORM_BUFFER_BINDINGS-1,at least 36-1
+#Range: -1 ~ 128
+"UBO offset" = -1
+#setting block bloom
+#true for effect on
+#Block bloom only, does not apply to post-processing
+"Block Bloom Effect" = true
+#using light analyzeShaderProperties for more realistic lighting
+#true for light analyzeShaderProperties ON
+#If using the light analyzeShaderProperties, the light is more realistic and avoid lights through the wall. The light is smoother when closed. It is a tradeoff.
+"Using Light Map" = true
+"enable colored light" = false
+"enable bloom effect" = true
+#using additive blend for colored lights
+#true - vivid, false - realistic
+"additive effect" = false
+#the color attachment number used for store bloom information
+#range from 1 (0 for vanilla use) to GL_MAX_COLOR_ATTACHMENTS-1, at least 8-1
+#
+#Range: 1 ~ 16
+"bloom color attachment number" = 1
+#whether inset shader name into shader source file or not
+#
+"inset shader" = false
+#whether enable buildin shimmer.json
+#
+"enable buildin setting" = true
+
diff --git a/config/sodium-extra-options.json b/config/sodium-extra-options.json
index 501f30b75..a413acab0 100644
--- a/config/sodium-extra-options.json
+++ b/config/sodium-extra-options.json
@@ -45,20 +45,20 @@
"overlay_corner": "TOP_LEFT",
"text_contrast": "NONE",
"show_fps": false,
- "show_f_p_s_extended": true,
+ "show_f_p_s_extended": false,
"show_coords": false,
"reduce_resolution_on_mac": false,
"use_adaptive_sync": false,
"cloud_height": 192,
"cloud_distance": 100,
- "toasts": true,
+ "toasts": false,
"advancement_toast": false,
"recipe_toast": false,
"system_toast": false,
"tutorial_toast": false,
"instant_sneak": false,
"prevent_shaders": false,
- "steady_debug_hud": true,
+ "steady_debug_hud": false,
"steady_debug_hud_refresh_interval": 10
},
"super_secret_settings": {
diff --git a/kubejs/assets/shimmer/shimmer.json b/kubejs/assets/shimmer/shimmer.json
new file mode 100644
index 000000000..f7a75d645
--- /dev/null
+++ b/kubejs/assets/shimmer/shimmer.json
@@ -0,0 +1,407 @@
+{
+ "ColorReference": {
+ "boricGreen": { "r": 41, "g": 200, "b": 50, "a": 50 },
+ "brightWhite": { "r": 150, "g": 150, "b": 150, "a": 50 },
+ "corundumBlack": { "r": 106, "g": 104, "b": 114, "a": 200 },
+ "corundumBlue": { "r": 64, "g": 197, "b": 235, "a": 200 },
+ "corundumGreen": { "r": 75, "g": 203, "b": 8, "a": 200 },
+ "corundumIndigo": { "r": 97, "g": 99, "b": 230, "a": 200 },
+ "corundumOrange": { "r": 240, "g": 127, "b": 0, "a": 200 },
+ "corundumRed": { "r": 255, "g": 37, "b": 68, "a": 200 },
+ "corundumViolet": { "r": 209, "g": 8, "b": 150, "a": 200 },
+ "corundumWhite": { "r": 215, "g": 226, "b": 237, "a": 200 },
+ "corundumYellow": { "r": 255, "g": 234, "b": 0, "a": 200 },
+ "darkPink": { "r": 120, "g": 24, "b": 70, "a": 200 },
+ "endPink": { "r": 100, "g": 26, "b": 99, "a": 200 },
+ "faintBlue": { "r": 27, "g": 75, "b": 110, "a": 50 },
+ "faintOrange": { "r": 120, "g": 55, "b": 0, "a": 50 },
+ "faintRed": { "r": 120, "g": 26, "b": 0, "a": 150 },
+ "faintWhite": { "r": 64, "g": 64, "b": 64, "a": 50 },
+ "glowstoneOrange": { "r": 255, "g": 100, "b": 0, "a": 50 },
+ "magmaRed": { "r": 255, "g": 26, "b": 0, "a": 150 },
+ "ochre": { "r": 150, "g": 85, "b": 0, "a": 50 },
+ "pastelOrange": { "r": 115, "g": 69, "b": 36, "a": 50 },
+ "pastelPurple": { "r": 150, "g": 75, "b": 255, "a": 255 },
+ "pearlescent": { "r": 50, "g": 0, "b": 100, "a": 50 },
+ "portalPurple": { "r": 47, "g": 2, "b": 187, "a": 200 },
+ "redstoneRed": { "r": 255, "g": 0, "b": 0, "a": 200 },
+ "shroomRed": { "r": 255, "g": 80, "b": 50, "a": 50 },
+ "soulBlue": { "r": 0, "g": 140, "b": 236, "a": 150 },
+ "soulGreen": { "r": 0, "g": 211, "b": 200, "a": 50 },
+ "verdant": { "r": 56, "g": 100, "b": 43, "a": 50 }
+ },
+ "Bloom": [
+ { "particle": "minecraft:dragon_breath" },
+ { "particle": "minecraft:dripping_dripstone_lava" },
+ { "particle": "minecraft:dripping_lava" },
+ { "particle": "minecraft:electric_spark" },
+ { "particle": "minecraft:enchant" },
+ { "particle": "minecraft:enchanted_hit" },
+ { "particle": "minecraft:end_rod" },
+ { "particle": "minecraft:glow" },
+ { "particle": "minecraft:glow_squid_ink" },
+ { "particle": "minecraft:landing_lava" },
+ { "particle": "minecraft:lava" },
+ { "particle": "minecraft:sculk_soul" },
+ { "particle": "minecraft:shriek" },
+ { "particle": "minecraft:small_flame" },
+ { "particle": "minecraft:sonic_boom" },
+ { "particle": "minecraft:soul_fire_flame" },
+ { "particle": "minecraft:vibration" },
+
+
+ { "block": "minecraft:amethyst_cluster" },
+ { "block": "minecraft:magma_block"},
+ { "block": "minecraft:fire" },
+ { "block": "minecraft:glow_lichen" },
+ { "block": "minecraft:large_amethyst_bud" },
+ { "block": "minecraft:medium_amethyst_bud" },
+ { "block": "minecraft:nether_portal" },
+ { "block": "minecraft:ochre_froglight" },
+ { "block": "minecraft:pearlescent_froglight" },
+ { "block": "minecraft:redstone_wire", "state": { "power": 1 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 2 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 3 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 4 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 5 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 6 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 7 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 8 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 9 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 10 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 11 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 12 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 13 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 14 } },
+ { "block": "minecraft:redstone_wire", "state": { "power": 15 } },
+ { "block": "minecraft:sea_lantern" },
+ { "block": "minecraft:shroomlight" },
+ { "block": "minecraft:small_amethyst_bud" },
+ { "block": "minecraft:soul_fire" },
+ { "block": "minecraft:verdant_froglight" },
+
+ { "block": "framedblocks:framed_activator_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_bouncy_cube", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_corner_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_cube", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_detector_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_door", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_prism_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_slope_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_slope_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_sloped_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_stairs", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_double_threeway_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_elevated_double_slope_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_elevated_slope_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_extended_double_slope_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_extended_slope_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_fancy_activator_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_fancy_detector_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_fancy_powered_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_fancy_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_double_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_double_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_elev_double_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_elev_inner_double_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_elev_inner_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_elev_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_ext_double_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_ext_inner_double_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_ext_inner_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_ext_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_inner_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_inner_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_inv_double_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_inv_double_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_slope_panel_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_flat_slope_slab_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_floor_board", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_gate_door", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_glowing_cube" },
+ { "block": "framedblocks:framed_horizontal_pane", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inner_corner_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inner_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inner_prism_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inner_sloped_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inner_threeway_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inv_double_slope_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_inv_double_slope_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_iron_door", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_iron_gate_door", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_iron_trapdoor", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_powered_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_prism_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_prism_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_pyramid", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_pyramid_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_rail_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_redstone_block", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_secret_storage", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_slope", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_slope_panel", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_slope_slab", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_sloped_prism", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_stairs", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_target", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_threeway_corner", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_trapdoor", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_vertical_double_stairs", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_vertical_stairs", "state": { "glowing": true } },
+ { "block": "framedblocks:framed_wall_board", "state": { "glowing": true } },
+
+
+ { "fluid": "minecraft:lava" }
+ ],
+ "LightBlock": [
+ { "block": "minecraft:beacon", "color": "#brightWhite", "radius": 15 },
+ { "block": "minecraft:black_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:black_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:black_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:black_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:black_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:blast_furnace", "state": { "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:blue_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:blue_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:blue_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:blue_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:blue_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:brown_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:brown_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:brown_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:brown_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:brown_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:campfire", "state": { "lit": true }, "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:cave_vines", "state": { "berries": true }, "color": "#glowstoneOrange", "radius": 14 },
+ { "block": "minecraft:cave_vines_plant", "state": { "berries": true }, "color": "#glowstoneOrange", "radius": 14 },
+ { "block": "minecraft:crying_obsidian", "color": "#portalPurple", "radius": 10 },
+ { "block": "minecraft:cyan_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:cyan_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:cyan_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:cyan_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:cyan_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:deepslate_redstone_ore", "state": { "lit": true }, "color": "#redstoneRed", "radius": 9 },
+ { "block": "minecraft:enchanting_table", "color": "#portalPurple", "radius": 8 },
+ { "block": "minecraft:end_gateway", "color": "#brightWhite", "radius": 10 },
+ { "block": "minecraft:end_portal", "color": "#brightWhite", "radius": 10 },
+ { "block": "minecraft:end_rod", "color": "#faintWhite", "radius": 15 },
+ { "block": "minecraft:ender_chest", "color": "#portalPurple", "radius": 7 },
+ { "block": "minecraft:fire", "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:furnace", "state": { "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:glow_lichen", "color": "#faintWhite", "radius": 9 },
+ { "block": "minecraft:glowstone", "color": "#glowstoneOrange", "radius": 15 },
+ { "block": "minecraft:gray_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:gray_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:gray_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:gray_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:gray_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:green_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:green_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:green_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:green_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:green_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:jack_o_lantern", "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:lantern", "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:light", "state": { "level": 1 }, "color": "#brightWhite", "radius": 1 },
+ { "block": "minecraft:light", "state": { "level": 2 }, "color": "#brightWhite", "radius": 2 },
+ { "block": "minecraft:light", "state": { "level": 3 }, "color": "#brightWhite", "radius": 3 },
+ { "block": "minecraft:light", "state": { "level": 4 }, "color": "#brightWhite", "radius": 4 },
+ { "block": "minecraft:light", "state": { "level": 5 }, "color": "#brightWhite", "radius": 5 },
+ { "block": "minecraft:light", "state": { "level": 6 }, "color": "#brightWhite", "radius": 6 },
+ { "block": "minecraft:light", "state": { "level": 7 }, "color": "#brightWhite", "radius": 7 },
+ { "block": "minecraft:light", "state": { "level": 8 }, "color": "#brightWhite", "radius": 8 },
+ { "block": "minecraft:light", "state": { "level": 9 }, "color": "#brightWhite", "radius": 9 },
+ { "block": "minecraft:light", "state": { "level": 10 }, "color": "#brightWhite", "radius": 10 },
+ { "block": "minecraft:light", "state": { "level": 11 }, "color": "#brightWhite", "radius": 11 },
+ { "block": "minecraft:light", "state": { "level": 12 }, "color": "#brightWhite", "radius": 12 },
+ { "block": "minecraft:light", "state": { "level": 13 }, "color": "#brightWhite", "radius": 13 },
+ { "block": "minecraft:light", "state": { "level": 14 }, "color": "#brightWhite", "radius": 14 },
+ { "block": "minecraft:light", "state": { "level": 15 }, "color": "#brightWhite", "radius": 15 },
+ { "block": "minecraft:light_blue_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:light_blue_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:light_blue_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:light_blue_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:light_blue_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:light_gray_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:light_gray_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:light_gray_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:light_gray_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:light_gray_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:lime_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:lime_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:lime_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:lime_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:lime_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:magenta_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:magenta_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:magenta_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:magenta_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:magenta_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:magma_block", "color": "#magmaRed", "radius": 4 },
+ { "block": "minecraft:nether_portal", "color": "#portalPurple", "radius": 11 },
+ { "block": "minecraft:ochre_froglight", "color": "#ochre", "radius": 15 },
+ { "block": "minecraft:pearlescent_froglight", "color": "#pearlescent", "radius": 15 },
+ { "block": "minecraft:pink_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:pink_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:pink_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:pink_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:pink_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:purple_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:purple_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:purple_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:purple_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:purple_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:orange_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:orange_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:orange_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:orange_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:orange_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:red_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:red_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:red_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:red_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:red_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:redstone_lamp", "state": { "lit": true }, "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:redstone_ore", "state": { "lit": true }, "color": "#redstoneRed", "radius": 9 },
+ { "block": "minecraft:redstone_torch", "state": { "lit": true }, "color": "#redstoneRed", "radius": 7 },
+ { "block": "minecraft:redstone_wall_torch", "state": { "lit": true }, "color": "#redstoneRed", "radius": 7 },
+ { "block": "minecraft:respawn_anchor", "state": { "charges": 1 }, "color": "#portalPurple", "radius": 2 },
+ { "block": "minecraft:respawn_anchor", "state": { "charges": 2 }, "color": "#portalPurple", "radius": 6 },
+ { "block": "minecraft:respawn_anchor", "state": { "charges": 3 }, "color": "#portalPurple", "radius": 10 },
+ { "block": "minecraft:respawn_anchor", "state": { "charges": 4 }, "color": "#portalPurple", "radius": 14 },
+ { "block": "minecraft:sea_lantern", "color": "#faintBlue", "radius": 15 },
+ { "block": "minecraft:sea_pickle", "state": { "pickles": 1 }, "color": "#faintWhite", "radius": 6 },
+ { "block": "minecraft:sea_pickle", "state": { "pickles": 2 }, "color": "#faintWhite", "radius": 9 },
+ { "block": "minecraft:sea_pickle", "state": { "pickles": 3 }, "color": "#faintWhite", "radius": 12 },
+ { "block": "minecraft:sea_pickle", "state": { "pickles": 4 }, "color": "#faintWhite", "radius": 15 },
+ { "block": "minecraft:shroomlight", "color": "#shroomRed", "radius": 15 },
+ { "block": "minecraft:smoker", "state": { "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:soul_campfire", "state": { "lit": true }, "color": "#soulBlue", "radius": 10 },
+ { "block": "minecraft:soul_fire", "color": "#soulBlue", "radius": 10 },
+ { "block": "minecraft:soul_lantern", "color": "#soulBlue", "radius": 10 },
+ { "block": "minecraft:soul_torch", "color": "#soulBlue", "radius": 10 },
+ { "block": "minecraft:soul_wall_torch", "color": "#soulBlue", "radius": 10 },
+ { "block": "minecraft:torch", "color": "#faintOrange", "radius": 14 },
+ { "block": "minecraft:verdant_froglight", "color": "#verdant", "radius": 15 },
+ { "block": "minecraft:wall_torch", "color": "#faintOrange", "radius": 15 },
+ { "block": "minecraft:white_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:white_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:white_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:white_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:white_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:yellow_candle", "state": { "candles": 1, "lit": true }, "color": "#faintOrange", "radius": 3 },
+ { "block": "minecraft:yellow_candle", "state": { "candles": 2, "lit": true }, "color": "#faintOrange", "radius": 6 },
+ { "block": "minecraft:yellow_candle", "state": { "candles": 3, "lit": true }, "color": "#faintOrange", "radius": 9 },
+ { "block": "minecraft:yellow_candle", "state": { "candles": 4, "lit": true }, "color": "#faintOrange", "radius": 12 },
+ { "block": "minecraft:yellow_candle_cake", "state": { "lit": true }, "color": "#faintOrange", "radius": 3 },
+
+ { "block": "framedblocks:framed_redstone_torch", "state": { "lit": true }, "color": "#redstoneRed", "radius": 7 },
+ { "block": "framedblocks:framed_redstone_wall_torch", "state": { "lit": true }, "color": "#redstoneRed", "radius": 7 },
+ { "block": "framedblocks:framed_soul_torch", "color": "#soulBlue", "radius": 10 },
+ { "block": "framedblocks:framed_soul_wall_torch", "color": "#soulBlue", "radius": 10 },
+ { "block": "framedblocks:framed_torch", "color": "#faintOrange", "radius": 15 },
+ { "block": "framedblocks:framed_wall_torch", "color": "#faintOrange", "radius": 15 },
+ { "block": "framedblocks:framed_activator_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_bouncy_cube", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_corner_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_cube", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_detector_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_door", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_prism_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_slope_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_slope_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_sloped_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_stairs", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_double_threeway_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_elevated_double_slope_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_elevated_slope_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_extended_double_slope_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_extended_slope_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_fancy_activator_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_fancy_detector_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_fancy_powered_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_fancy_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_double_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_double_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_elev_double_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_elev_inner_double_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_elev_inner_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_elev_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_ext_double_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_ext_inner_double_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_ext_inner_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_ext_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_inner_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_inner_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_inv_double_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_inv_double_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_slope_panel_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_flat_slope_slab_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_floor_board", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_gate_door", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_glowing_cube", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_horizontal_pane", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inner_corner_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inner_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inner_prism_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inner_sloped_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inner_threeway_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inv_double_slope_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_inv_double_slope_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_iron_door", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_iron_gate_door", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_iron_trapdoor", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_powered_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_prism_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_prism_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_pyramid", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_pyramid_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_rail_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_redstone_block", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_secret_storage", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_slope", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_slope_panel", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_slope_slab", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_sloped_prism", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_stairs", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_target", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_threeway_corner", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_trapdoor", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_vertical_double_stairs", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_vertical_stairs", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 },
+ { "block": "framedblocks:framed_wall_board", "state": { "glowing": true }, "color": "#brightWhite", "radius": 15 }
+
+ ],
+ "LightItem": [
+ { "item_id": "minecraft:lantern", "r": 255, "g": 174, "b": 69, "a": 125, "radius": 10 },
+ { "item_id": "minecraft:redstone_torch", "color": "#redstoneRed", "radius": 3 },
+ { "item_id": "minecraft:soul_lantern", "r": 0, "g": 143, "b": 146, "a": 200, "radius": 10 },
+ { "item_id": "minecraft:soul_torch", "r": 0, "g": 211, "b": 236, "a": 125, "radius": 10 },
+ { "item_id": "minecraft:torch", "r": 255, "g": 174, "b": 69, "a": 125, "radius": 14 },
+
+ { "item_id": "framedblocks:framed_redstone_torch", "color": "#redstoneRed", "radius": 3 },
+ { "item_id": "framedblocks:framed_soul_torch", "r": 0, "g": 211, "b": 236, "a": 125, "radius": 10 },
+ { "item_id": "framedblocks:framed_torch", "r": 255, "g": 174, "b": 69, "a": 125, "radius": 15 }
+ ]
+}
\ No newline at end of file
diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json
new file mode 100644
index 000000000..209e4a64d
--- /dev/null
+++ b/kubejs/assets/tfg/lang/zh_cn.json
@@ -0,0 +1,126 @@
+{
+ "quests.naming-1": "t - Title",
+ "quests.naming-2": "st - Subtitle",
+ "quests.naming-3": "d* - Description, where * description number, for example: d1, d2, d3, d4...",
+ "quests.naming-4": "t* - Task, where * task number, for example: t1, t2, t3, t4...",
+
+ "quests.76EF4D00586A8B74.t": "&aTerraFirmaGreg Modpack!",
+ "quests.76EF4D00586A8B74.st": "感谢你选择我们的整合包!",
+ "quests.76EF4D00586A8B74.d1": "美好时光由此开始!愿这个世界因你的存在而受到祝福!",
+
+ "quests.387DEEADF4922AB3.t": "TFG的矿物生成",
+ "quests.387DEEADF4922AB3.st": "比原(版)更好玩",
+ "quests.387DEEADF4922AB3.d1": "在TerraFirmaGreg中,矿物的生成尤其特别。 \n1. 每种矿石都出现在它自己的岩石中——TFC增加了许多不同种类的岩石,这意味着你在任何地方都找不到原版的石头。因此,矿石只会在特定的岩石中生成,就像在现实生活中一样。 \n2. 矿脉分为几种类型:簇状、球形、管状,还有一些这里我们暂且不讨论的稀有类型。 \n3. 为了方便玩家, 矿物指示物会出现在地表,绝大多数情况下这就是包含该矿物的矿脉所在的位置。 \nTFG有一个小型Wiki,它是一张Excel表。为了获得链接,你需要完成任务,然后领取奖励。之后聊天中会显示一个按钮,点击这个按钮,你将被重定向到一个带有矿石生成信息的Excel表格。",
+
+ "quests.63E6C5684E12828C.st": "你得喝水来保持不死,试着找条包含淡水的河流或湖泊!",
+ "quests.63E6C5684E12828C.d1": "使用右键喝水。 \n注意!如果你喝了咸水你的口渴值会上升并且你很有可能会似。",
+ "quests.63E6C5684E12828C.t1": "找淡水(既不咸也不热)",
+
+ "quests.6D43C29AC049341D.t": "如何创建队伍?",
+ "quests.6D43C29AC049341D.st": "你居然有朋友和你一起玩这个包,谔谔",
+ "quests.6D43C29AC049341D.d1": "你可以创建一个团队来一起完成任务。为此,打开你的物品栏,然后在左上角选择画有3个彩色人物的按钮,然后会打开一个界面,在这个界面中你可以创建一个团队,使用§a创建团队§r按钮,然后给它起一个名字并设置一些其他参数。成功创建团队后,你可以使用右上角绿色圆圈中的加号按钮邀请其他玩家加入。从此开始你的任务将会同步,任何团队成员都将能够完成它们。祝你好运!",
+ "quests.6D43C29AC049341D.t1": "点这里完成任务",
+
+ "quests.0B42D4AE2AC67F93.t": "如何划分领地?",
+ "quests.0B42D4AE2AC67F93.st": "如何在你的领地内加载区块",
+ "quests.0B42D4AE2AC67F93.d1": "如果你在服务器上玩游戏,你可以划分自己的私有区块。怎么做呢?使用按钮打开小地图,然后选择你想要划分的区块,接着通过点击鼠标右键,从列表中选择§a占领领地§r,它应该是从下往上数第三个选项。大功告成!你已经占领了这片领地。注意:你的队友将能够在你的区域内破坏方块,这很合理。",
+ "quests.0B42D4AE2AC67F93.t1": "点这里完成任务",
+
+ "quests.2672C65095539E23.t": "没有粉碎机要怎么粉碎矿物?",
+ "quests.2672C65095539E23.st": "其实很简单",
+ "quests.2672C65095539E23.d1": "简单地用锤子(大锤)敲碎一块矿石块,你将立即得到粉碎的矿石,这些粉碎的矿石可以手工粉碎成如石墨或硫磺等粉末。",
+ "quests.2672C65095539E23.t1": "点这里完成任务",
+
+ "quests.3D7B0F3134C30364.t": "关于任务的重要信息!",
+ "quests.3D7B0F3134C30364.d1": "任务仍在开发中,将来会添加更多的描述等内容。你可以使用TFC书籍来找到一部分你需要的信息。&c每个分支中的完整任务和翻译将会在1.0.0更新中出现,因为现在开发者们的时间非常有限。",
+ "quests.3D7B0F3134C30364.t1": "点这里完成任务",
+
+ "quests.7196BB6BDBAE7B51.st": "食物在这个世界里非常重要!",
+ "quests.7196BB6BDBAE7B51.d1": "试着杀死一些动物并从他们身上获得肉。吃生肉是个坏主意,所以最好试着用火烤熟它们。",
+ "quests.7196BB6BDBAE7B51.t1": "获得任意生肉",
+
+ "quests.557D3A67A36DF9D8.st": "烤肉Man!",
+ "quests.557D3A67A36DF9D8.d1": "恭喜,现在肉烤熟了以后你终于可以放心吃了。",
+ "quests.557D3A67A36DF9D8.t1": "获得任意熟肉",
+
+ "quests.682B58EC2D39F1A1.st": "这可不是一般的火",
+ "quests.682B58EC2D39F1A1.d1": "在方块上扔下3根木棍和1个原木,然后将鼠标光标悬停在这个方块上并使用一种简易打火器。它可能没法一次成功。成功后,原本扔下的3根木棍和1个原木的位置会出现生出火焰,你需要继续扔原木进去以保持火焰燃烧。为了提高篝火生成的几率,你可以在扔下的物品中添加纸、干草等易燃物品,每增加一个物品,成功率提高10%。",
+ "quests.682B58EC2D39F1A1.t1": "生一堆火",
+
+ "quests.6D940527BFF1D4C0.t": "原始照明",
+ "quests.6D940527BFF1D4C0.st": "它们是灭了吗?没错!他们会熄灭, 我也很惊讶!",
+ "quests.6D940527BFF1D4C0.d1": "你可能会感到惊讶,但在TFC中火把不是无限耐久的。它们大约会在燃烧两天后熄灭。不过不用担心,它们不会在你手中或者背包里熄灭,所以你可以随身携带一根火把,当你家里的其他火把熄灭时,只需走过去并右键点击它们。这会点燃火把,然后它们就会再次亮起来。",
+
+ "quests.3B3BA51C8CAEFC7F.t": "原始打火机",
+ "quests.3B3BA51C8CAEFC7F.st": "古人就是靠这个点火的,也可能不是,我不到啊",
+ "quests.3B3BA51C8CAEFC7F.d1": "这个东西能让你生火或者点燃任何东西。只需将鼠标光标悬停在任意方块上,然后按住鼠标右键,达到最大力度后释放,你所注视的方块会有50%的机会被点燃。下一个任务将解释如何制作篝火。",
+
+ "quests.365F6F48E0BB2EFC.t": "ROCK AND STONE!",
+ "quests.365F6F48E0BB2EFC.st": "收集一些石子和木枝为今后做准备",
+ "quests.365F6F48E0BB2EFC.d1": "进入这个世界后,你发现你所熟知的一切都变了。游戏初期最主要的物品是地上的木枝和石子,它们可以在任意生物群系被找到,并且每个季节都会刷新。使用鼠标右键收集它们并进入下一步。\n\n手持两个或以上的石子后右键可以看到一个菜单,在这个菜单中你可以制作石制工具的主要部分(工具头)。所有的配方都可以在REI中查看,你也可以在工具配方中单击查看石头工具头的制作方法。然后将这个工具头与一根木枝连接起来,你就得到了一个真正的土著人的工具。\n\n***现在,你会成为,我们中的一员***",
+ "quests.365F6F48E0BB2EFC.t1": "收集任意木枝",
+ "quests.365F6F48E0BB2EFC.t2": "收集任意石子",
+
+ "quests.508DA76FA2766B7B.st": "这可不是火箭发射器!",
+ "quests.508DA76FA2766B7B.d1": "矛和原版游戏三叉戟的原理差不多,只需长按右键并瞄准,再松开,你的三叉戟(矛)就能指哪打哪。",
+ "quests.508DA76FA2766B7B.t1": "合成任意石矛",
+
+ "quests.318BF1F671BC4620.st": "不是钻石锄我谢谢你啊...",
+ "quests.318BF1F671BC4620.d1": "锄头用于挖掘田地和种植植物。有趣的事实:在TFC中,你甚至可以远离水源挖掘田地,重要的是在光标悬停在方块上时查看工具提示(上方的面板),它会显示田地的水分饱和度。接下来,选择适合当前气候条件(包括田地的湿度)作物的种子,种植并等待。",
+
+ "quests.36A9E5CD45A79288.st": "现实主义",
+ "quests.36A9E5CD45A79288.d1": "手持锄头右键即可锄地。讲真,超简单,试试看。",
+ "quests.36A9E5CD45A79288.t1": "锄大地",
+
+ "quests.5C396041880D32FF.st": "看上去挺靠谱",
+ "quests.5C396041880D32FF.d1": "在探索世界时,你可以发现野生植物,用刀子或空手收集它们,你就可以获得种子和植物本身。",
+ "quests.5C396041880D32FF.t1": "找到任意种子",
+
+ "quests.4CF472C9778068D6.t": "年轻人的第一次丰收",
+ "quests.4CF472C9778068D6.st": "这能吃吗?",
+ "quests.4CF472C9778068D6.d1": "我不好说。 \n\n注意!植物的生长周期非常长,它们对生长条件也非常挑剔;在种植之前,一定要检查特定植物的生长条件,否则它将变成一株枯萎的灌木。",
+ "quests.4CF472C9778068D6.t1": "点击这里完成任务",
+
+ "quests.2BFC2744E4DE4B5A.st": "错误的,你不能徒手撸树!",
+ "quests.2BFC2744E4DE4B5A.d1": "斧头用于砍木头和破坏一切木质的东西,因为在TFC里你不能空手伐木。",
+
+ "quests.716B407EEED8BE95.st": "空泥奇挖",
+ "quests.716B407EEED8BE95.d1": "铲子可以用来制作道路方块,挖土,沙子,以及一些其他东西!",
+
+ "quests.06C7B7138EDE4B38.st": "你最好的朋友",
+ "quests.06C7B7138EDE4B38.d1": "刀在TFC中是一个非常重要的工具,它允许你割草并制作干草捆,你还可以用它来制作火坑,烤制金属和烧制陶土模具,但更多内容会在任务指南中说明。",
+
+ "quests.45D907EF7902A200.st": "需要建造一个庇护所或烤火坑",
+ "quests.45D907EF7902A200.d1": "前期非常重要的物品,你会用到很多。我的建议是整差不多三组。",
+
+ "quests.27DA5AAB102611A2.st": "一顶可爱的帽子,可以保护你免受炎热和烈日的侵扰。",
+
+ "quests.30AE1FF285B64716.st": "这是一捆稻草,你可以用它建造一个可爱的房子。",
+
+ "quests.0ED8BE436A0ECDDB.st": "这是一捆干草,你可以用它制作漂亮的装饰品。",
+ "quests.0ED8BE436A0ECDDB.d1": "没错,它就是个装饰性方块,别试着拿它喂马。",
+
+ "quests.69D20168E26BBF59.st": "太真实了",
+ "quests.69D20168E26BBF59.d1": "首先,在地面或任何其他表面挖一个一格高的洞,然后使用V键把你想要烤的东西放进洞里。如果是模具,那么可以放4个。接下来,手持干草捆,右键点击洞内,干草将开始填充这个洞,你需要使用8个干草捆,然后以相同的方式添加8根原木,然后你可以用原始的打火石或火把点燃这个东西(只需从洞顶扔下一个火把,它就会开始燃烧)。接着你必须等待烧制完成,然后取出你的成品。以同样的方式,金属也会在容器中熔化。也就是说,你把铜片放在一个容器中,再把容器放这个坑里,经过上述过程后你会得到熔化的铜,你可以将其铸造成锭、工具的头等。",
+ "quests.69D20168E26BBF59.t1": "做一个烤火坑",
+
+ "quests.373FD04AD6CA9F92.t": "新树,旧树",
+ "quests.373FD04AD6CA9F92.st": "用斧头整点木头,不过我要提醒你的是你没法空手撸树",
+ "quests.373FD04AD6CA9F92.t1": "砍伐任意树木",
+
+ "quests.5DB0CA9F9724D301.t": "煤坑",
+ "quests.5DB0CA9F9724D301.st": "获得你第一块煤炭!(等下我为啥要这玩意来着)",
+ "quests.5DB0CA9F9724D301.d1": "你会需要非常非常多的原木来制作煤坑。首先你需要挖一个一格深的洞(如果你有足够多的木头也可以挖得更深)",
+ "quests.5DB0CA9F9724D301.d2": "接着Shift右键坑中任意的方块,你将会得到一捆木头。你可以通过手持木头右键点击这捆木头来填充它,或者直接打开界面手动填充。木头的数量决定了最终获得的煤炭数量。",
+ "quests.5DB0CA9F9724D301.d3": "接下来,用一个不可燃的方块,比如石头或泥土,覆盖所有木头,留下一个方块未盖,并用丢弃的火把或简易打火器将其点燃。",
+ "quests.5DB0CA9F9724D301.d4": "泥土堆开始冒烟后,用一个不可燃的方块再次覆盖你点燃的最后一个方块。等到泥土堆停止冒烟,挖开它,你就能得到煤炭。",
+
+ "quests.478D0DF94D7495EF.st": "这真的很简单吗?",
+ "quests.478D0DF94D7495EF.d1": "TFC指南书中展示了玻璃铸造过程,你可以在右侧的库存中找到这本书,但对于玻璃块,或者更确切地说,对于它们的铸造,你会需要黄铜块,在TerraFirmaGreg中,你可以使用GTCEu的黄铜块或高岭粘土块,祝你好运!:)",
+ "quests.478D0DF94D7495EF.t1": "铸造任意玻璃",
+
+ "quests..t": "",
+ "quests..st": "",
+ "quests..d1": "",
+ "quests..t1": ""
+}
diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js
index 41d78a442..e4d45483f 100644
--- a/kubejs/server_scripts/ae2/recipes.js
+++ b/kubejs/server_scripts/ae2/recipes.js
@@ -561,7 +561,7 @@ const registerAE2Recipes = (event) => {
.itemInputs(
'2x #forge:rods/aluminium',
'3x ae2:quartz_fiber',)
- .inputFluids(Fluid.of('gtceu:fluix', 144))
+ .inputFluids(Fluid.of('tfg:fluix', 144))
.itemOutputs('ae2:fluix_glass_cable')
.circuit(1)
.duration(20)
@@ -1022,7 +1022,7 @@ const registerAE2Recipes = (event) => {
.itemOutputs('ae2:level_emitter')
.circuit(1)
.duration(20)
- .EUt(7680)
+ .EUt(480)
.cleanroom(CleanroomType.CLEANROOM)
// Storage Bus
@@ -2041,7 +2041,7 @@ const registerAE2Recipes = (event) => {
// Chemical Reactor
event.recipes.gtceu.chemical_reactor('ae2:fluix_pearl')
.itemInputs('4x #forge:gems/fluix', '#forge:gems/ender_eye')
- .inputFluids(Fluid.of('gtceu:fluix', 576))
+ .inputFluids(Fluid.of('tfg:fluix', 576))
.itemOutputs('ae2:fluix_pearl')
.duration(200)
.EUt(480)
@@ -2087,4 +2087,14 @@ const registerAE2Recipes = (event) => {
.itemOutputs('12x ae2:fluix_crystal')
.duration(480)
.EUt(256)
+
+ //charger
+ event.recipes.gtceu.assembler('ae2:charger')
+ .itemInputs(
+ 'gtceu:hv_battery_buffer_4x',
+ '4x gtceu:mercury_barium_calcium_cuprate_quadruple_wire', )
+ .inputFluids(Fluid.of('tfg:fluix', 476))
+ .itemOutputs('ae2:charger')
+ .duration(200)
+ .EUt(480)
}
\ No newline at end of file
diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js
index eeb284986..9db24e928 100644
--- a/kubejs/server_scripts/extended_ae2/recipes.js
+++ b/kubejs/server_scripts/extended_ae2/recipes.js
@@ -1,150 +1,487 @@
-// priority: 0
-
const registerExtendedAE2Recipes = (event) => {
+
+ event.remove({not:[
+ { id: 'expatternprovider:epp_part' },
+ { id: 'expatternprovider:ei_part' },
+ { id: 'expatternprovider:epp_alt' },
+ { id: 'expatternprovider:ei_alt' },
+ ], mod: 'expatternprovider' });
- event.remove({ mod: 'expatternprovider' })
-
- // event.recipes.gtceu.assembler('')
- // .itemInputs('8x ae2:dense_energy_cell', '8x gtceu:nichrome_quadruple_wire', '4x #gtceu:circuits/iv')
- // .itemOutputs('megacells:mega_energy_cell')
- // .circuit(1)
- // .duration(960)
- // .EUt(2048)
//#region Ext interface
+ // IV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_interface_iv')
+ .itemInputs(
+ '2x #megacells:mega_interface',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:iv_conveyor_module',
+ 'gtceu:fusion_glass',
+ '2x #forge:dense_plates/tungsten_steel',
+ '#gtceu:circuits/iv',
+ '2x #gtceu:circuits/ev',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('expatternprovider:ex_interface')
+ .duration(300)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // IV
- // event.recipes.gtceu.assembler('expatternprovider:ex_interface_iv')
- // .itemInputs(
- // '2x #megacells:mega_interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:iv_conveyor_module',
- // 'gtceu:fusion_glass',
- // '4x gtceu:tungsten_steel_plate',
- // '#gtceu:circuits/iv',)
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('expatternprovider:ex_interface')
- // .duration(300)
- // .EUt(7680)
- // .cleanroom(CleanroomType.CLEANROOM)
+ // LuV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_interface_luv')
+ .itemInputs(
+ '4x #megacells:mega_interface',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:luv_conveyor_module',
+ '2x gtceu:fusion_glass',
+ '2x #forge:dense_plates/rhodium_plated_palladium',
+ '#gtceu:circuits/luv',
+ '2x #gtceu:circuits/iv',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('2x expatternprovider:ex_interface')
+ .duration(300)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // LuV
- // event.recipes.gtceu.assembler('expatternprovider:ex_interface_luv')
- // .itemInputs(
- // '4x #megacells:mega_interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:luv_conveyor_module',
- // 'gtceu:fusion_glass',
- // '4x gtceu:rhodium_plated_palladium_plate',
- // '#gtceu:circuits/luv')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('2x expatternprovider:ex_interface')
- // .duration(300)
- // .EUt(30720)
- // .cleanroom(CleanroomType.CLEANROOM)
+ // ZPM
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_interface_zpm')
+ .itemInputs(
+ '8x #megacells:mega_interface',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:zpm_conveyor_module',
+ '4x gtceu:fusion_glass',
+ '2x #forge:dense_plates/naquadah_alloy',
+ '#gtceu:circuits/zpm',
+ '2x #gtceu:circuits/luv',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('4x expatternprovider:ex_interface')
+ .duration(300)
+ .EUt(119680)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // ZPM
- // event.recipes.gtceu.assembler('expatternprovider:ex_interface_zpm')
- // .itemInputs(
- // '8x #megacells:mega_interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:zpm_conveyor_module',
- // 'gtceu:fusion_glass',
- // '4x gtceu:naquadah_alloy_plate',
- // '#gtceu:circuits/zpm')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('4x expatternprovider:ex_interface')
- // .duration(300)
- // .EUt(119680)
- // .cleanroom(CleanroomType.CLEANROOM)
+ // UV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_interface_ev')
+ .itemInputs(
+ '16x #megacells:mega_interface',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:uv_conveyor_module',
+ '8x gtceu:fusion_glass',
+ '4x #forge:dense_plates/darmstadtium',
+ '#gtceu:circuits/uv',
+ '2x #gtceu:circuits/zpm',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('8x expatternprovider:ex_interface')
+ .duration(300)
+ .EUt(491520)
+ .cleanroom(CleanroomType.CLEANROOM)
+ //#endregion
- // // UV
- // event.recipes.gtceu.assembler('expatternprovider:ex_interface_ev')
- // .itemInputs(
- // '16x #megacells:mega_interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:uv_conveyor_module',
- // 'gtceu:fusion_glass',
- // '4x #forge:plates/darmstadtium',
- // '#gtceu:circuits/uv')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('8x expatternprovider:ex_interface')
- // .duration(300)
- // .EUt(491520)
- // .cleanroom(CleanroomType.CLEANROOM)
- // //#endregion
+ //#region ex pattern provider
+ // IV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_pattern_provider_iv')
+ .itemInputs(
+ '2x #megacells:mega_pattern_provider',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:iv_conveyor_module',
+ '2x #forge:dense_plates/tungsten_steel',
+ '#gtceu:circuits/iv',
+ '2x #gtceu:circuits/ev',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('expatternprovider:ex_pattern_provider')
+ .duration(300)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
- // //#region ex pattern provider
- // // IV
- // event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_iv')
- // .itemInputs(
- // '2x #megacells:mega_pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:iv_conveyor_module',
- // '4x gtceu:tungsten_steel_plate',
- // '#gtceu:circuits/iv',)
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('expatternprovider:ex_pattern_provider')
- // .duration(300)
- // .EUt(7680)
- // .cleanroom(CleanroomType.CLEANROOM)
+ // LuV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_pattern_provider_luv')
+ .itemInputs(
+ '4x #megacells:mega_pattern_provider',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:luv_conveyor_module',
+ '2x #forge:dense_plates/rhodium_plated_palladium',
+ '#gtceu:circuits/luv',
+ '2x #gtceu:circuits/iv',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('2x expatternprovider:ex_pattern_provider')
+ .duration(300)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // LuV
- // event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_luv')
- // .itemInputs(
- // '4x #megacells:mega_pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:luv_conveyor_module',
- // '4x gtceu:rhodium_plated_palladium_plate',
- // '#gtceu:circuits/luv')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('2x expatternprovider:ex_pattern_provider')
- // .duration(300)
- // .EUt(30720)
- // .cleanroom(CleanroomType.CLEANROOM)
+ // ZPM
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_pattern_provider_zpm')
+ .itemInputs(
+ '8x #megacells:mega_pattern_provider',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:zpm_conveyor_module',
+ '2x #forge:dense_plates/naquadah_alloy',
+ '#gtceu:circuits/zpm',
+ '2x #gtceu:circuits/luv',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('4x expatternprovider:ex_pattern_provider')
+ .duration(300)
+ .EUt(119680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //UV
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_pattern_provider_uv')
+ .itemInputs(
+ '16x #megacells:mega_pattern_provider',
+ '4x megacells:accumulation_processor',
+ '4x gtceu:uv_conveyor_module',
+ '2x #forge:dense_plates/darmstadtium',
+ '#gtceu:circuits/uv',
+ '2x #gtceu:circuits/zpm',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
+ .itemOutputs('8x expatternprovider:ex_pattern_provider')
+ .duration(300)
+ .EUt(491520)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // ZPM
- // event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_zpm')
- // .itemInputs(
- // '8x #megacells:mega_pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:zpm_conveyor_module',
- // '4x gtceu:naquadah_alloy_plate',
- // '#gtceu:circuits/zpm')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('4x expatternprovider:ex_pattern_provider')
- // .duration(300)
- // .EUt(119680)
- // .cleanroom(CleanroomType.CLEANROOM)
+ //#endregion
- // //UV
- // event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_uv')
- // .itemInputs(
- // '16x #megacells:mega_pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:uv_conveyor_module',
- // '4x #forge:plates/darmstadtium',
- // '#gtceu:circuits/uv')
- // .inputFluids(Fluid.of('gtceu:polybenzimidazole', 1152))
- // .itemOutputs('8x expatternprovider:ex_pattern_provider')
- // .duration(300)
- // .EUt(491520)
- // .cleanroom(CleanroomType.CLEANROOM)
+ //#region bus
- // //#endregion
+ //ex import bus part
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_import_bus_part')
+ .itemInputs(
+ '2x #forge:plates/tungsten_steel',
+ '8x ae2:calculation_processor',
+ '4x megacells:accumulation_processor',
+ '4x ae2:annihilation_core',
+ '2x ae2:import_bus',
+ '2x gtceu:iv_conveyor_module',
+ '2x gtceu:iv_electric_pump',
+ 'gtceu:iv_robot_arm',
+ '4x #forge:rods/tungsten_steel',
+ '8x #forge:bolts/tungsten_steel',
+ '4x ae2:speed_card',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 144))
+ .itemOutputs('expatternprovider:ex_import_bus_part')
+ .duration(200)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
- // // cable mega interface
- // event.shapeless('expatternprovider:ex_interface_part', ['expatternprovider:ex_interface'])
- // .id('expatternprovider:crafting/ex_interface_part')
+ //ex export bus part
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_export_bus_part')
+ .itemInputs(
+ '2x #forge:plates/tungsten_steel',
+ '8x ae2:calculation_processor',
+ '4x megacells:accumulation_processor',
+ '4x ae2:formation_core',
+ '2x ae2:export_bus',
+ '2x gtceu:iv_conveyor_module',
+ '2x gtceu:iv_electric_pump',
+ 'gtceu:iv_robot_arm',
+ '4x #forge:rods/tungsten_steel',
+ '8x #forge:bolts/tungsten_steel',
+ '4x ae2:speed_card',)
+ .inputFluids(Fluid.of('gtceu:polybenzimidazole', 144))
+ .itemOutputs('expatternprovider:ex_export_bus_part')
+ .duration(200)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
- // event.shapeless('expatternprovider:ex_interface', ['expatternprovider:ex_interface_part'])
- // .id('expatternprovider:crafting/ex_interface')
+ //tag export bus
+ event.recipes.gtceu.assembler('expatternprovider:tag_export_bus')
+ .itemInputs(
+ 'expatternprovider:ex_export_bus_part',
+ '2x ae2:logic_processor',
+ 'gtceu:digital_interface_cover',)
+ .itemOutputs('expatternprovider:tag_export_bus')
+ .duration(100)
+ .EUt(480)
- // // cable mega pattern provider
- // event.shapeless('expatternprovider:ex_pattern_provider_part', ['expatternprovider:ex_pattern_provider'])
- // .id('expatternprovider:crafting/ex_pattern_provider')
+ //tag storage bus
+ event.recipes.gtceu.assembler('expatternprovider:tag_storage_bus')
+ .itemInputs(
+ 'ae2:storage_bus',
+ '2x ae2:logic_processor',
+ 'gtceu:digital_interface_cover',)
+ .itemOutputs('expatternprovider:tag_storage_bus')
+ .duration(100)
+ .EUt(480)
- // event.shapeless('expatternprovider:ex_pattern_provider', ['expatternprovider:ex_pattern_provider_part'])
- // .id('expatternprovider:crafting/ex_pattern_provider_part')
-}
+ //mod export bus
+ event.recipes.gtceu.assembler('expatternprovider:mod_export_bus')
+ .itemInputs(
+ 'expatternprovider:ex_export_bus_part',
+ '2x ae2:calculation_processor',
+ 'gtceu:digital_interface_cover',)
+ .itemOutputs('expatternprovider:mod_export_bus')
+ .duration(100)
+ .EUt(480)
+
+ //mod storage bus
+ event.recipes.gtceu.assembler('expatternprovider:mod_storage_bus')
+ .itemInputs(
+ 'ae2:storage_bus',
+ '2x ae2:calculation_processor',
+ 'gtceu:digital_interface_cover',)
+ .itemOutputs('expatternprovider:mod_storage_bus')
+ .duration(100)
+ .EUt(480)
+
+ //precise export bus
+ event.recipes.gtceu.assembler('expatternprovider:precise_export_bus')
+ .itemInputs(
+ 'expatternprovider:ex_export_bus_part',
+ '2x ae2:calculation_processor',)
+ .itemOutputs('expatternprovider:precise_export_bus')
+ .duration(100)
+ .EUt(480)
+
+ //precise storage bus
+ event.recipes.gtceu.assembler('expatternprovider:precise_storage_bus')
+ .itemInputs(
+ 'ae2:storage_bus',
+ '2x ae2:calculation_processor',)
+ .itemOutputs('expatternprovider:precise_storage_bus')
+ .duration(100)
+ .EUt(480)
+
+ //threshold export bus
+ event.recipes.gtceu.assembler('expatternprovider:threshold_export_bus')
+ .itemInputs(
+ 'expatternprovider:ex_export_bus_part',
+ '2x ae2:logic_processor',
+ 'ae2:level_emitter',)
+ .itemOutputs('expatternprovider:threshold_export_bus')
+ .duration(100)
+ .EUt(480)
+
+
+
+ //#endregion
+
+ //caner
+ event.recipes.gtceu.assembler('expatternprovider:caner')
+ .itemInputs(
+ '#forge:frames/stainless_steel',
+ 'expatternprovider:ingredient_buffer',
+ 'ae2:import_bus',
+ 'ae2:export_bus',
+ '2x ae2:calculation_processor')
+ .itemOutputs('expatternprovider:caner')
+ .duration(100)
+ .EUt(480)
+
+ //active formation plane
+ event.recipes.gtceu.assembler('expatternprovider:active_formation_plane')
+ .itemInputs(
+ 'ae2:formation_plane',
+ 'expatternprovider:ex_export_bus_part',
+ '2x ae2:engineering_processor')
+ .itemOutputs('expatternprovider:active_formation_plane')
+ .duration(100)
+ .EUt(480)
+
+ //pattern modifier
+ event.recipes.gtceu.assembler('expatternprovider:pattern_modifier')
+ .itemInputs(
+ 'ae2:blank_pattern',
+ 'ae2:logic_processor')
+ .inputFluids(Fluid.of('gtceu:green_dye', 144))
+ .itemOutputs('expatternprovider:pattern_modifier')
+ .duration(100)
+ .EUt(480)
+
+ //threshold level emitter
+ event.recipes.gtceu.assembler('expatternprovider:threshold_level_emitter')
+ .itemInputs(
+ 'ae2:level_emitter',
+ '2x minecraft:redstone_torch',
+ '2x ae2:calculation_processor',)
+ .itemOutputs('expatternprovider:threshold_level_emitter')
+ .duration(100)
+ .EUt(480)
+
+ //wireless tool
+ event.recipes.gtceu.assembler('expatternprovider:wireless_tool')
+ .itemInputs(
+ '3x #forge:plates/steel',
+ '#gtceu:circuits/ev',
+ '2x gtceu:ev_emitter',
+ '2x ae2:wireless_receiver',
+ 'ae2:calculation_processor')
+ .itemOutputs('expatternprovider:wireless_tool')
+ .duration(100)
+ .EUt(1920)
+
+ //wireless tool
+ event.recipes.gtceu.assembler('expatternprovider:wireless_connect')
+ .itemInputs(
+ '2x gtceu:iv_machine_casing',
+ '4x #gtceu:circuits/iv',
+ '8x ae2:wireless_receiver',
+ '4x gtceu:iv_emitter',
+ '4x gtceu:iv_sensor',
+ '8x ae2:engineering_processor',
+ '4x megacells:accumulation_processor')
+ .itemOutputs('2x expatternprovider:wireless_connect')
+ .duration(200)
+ .EUt(7580)
+
+ //me packing tape
+ event.recipes.gtceu.assembler('expatternprovider:me_packing_tape')
+ .itemInputs(
+ '#forge:rods/stainless_steel',
+ '8x #forge:dusts/fluix',
+ '4x #forge:plates/paper',)
+ .inputFluids(Fluid.of('gtceu:glue', 144))
+ .itemOutputs(Item.of('expatternprovider:me_packing_tape', '{Damage:0}'))
+ .duration(100)
+ .EUt(1920)
+
+ //ex pattern access
+ event.recipes.gtceu.assembler('expatternprovider:ex_pattern_access_part')
+ .itemInputs(
+ 'ae2:pattern_access_terminal',
+ '4x ae2:logic_processor',
+ '2x megacells:accumulation_processor',)
+ .itemOutputs('expatternprovider:ex_pattern_access_part')
+ .duration(100)
+ .EUt(1920)
+
+ // Wireless Crafting Terminal
+ event.recipes.gtceu.assembler('expatternprovider:wireless_ex_pat')
+ .itemInputs(
+ '2x gtceu:hv_lithium_battery',
+ '2x gtceu:luv_sensor',
+ 'gtceu:luv_emitter',
+ '2x #forge:rods/osmiridium',
+ 'ae2:wireless_terminal',
+ 'expatternprovider:ex_pattern_access_part')
+ .itemOutputs('expatternprovider:wireless_ex_pat')
+ .duration(30)
+ .EUt(250)
+
+ //#region ex molecular assembler
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_molecular_assembler_iv')
+ .itemInputs(
+ '8x ae2:molecular_assembler',
+ '4x #gtceu:circuits/iv',
+ '2x #gtceu:circuits/ev',
+ '8x megacells:accumulation_processor',
+ '8x ae2:logic_processor',
+ '2x gtceu:iv_conveyor_module',
+ '2x gtceu:iv_robot_arm',
+ '4x #forge:rods/long/tungsten_steel',)
+ .inputFluids(
+ Fluid.of('gtceu:soldering_alloy', 576),
+ Fluid.of('gtceu:polybenzimidazole', 1152),)
+ .itemOutputs('expatternprovider:ex_molecular_assembler')
+ .duration(200)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_molecular_assembler_luv')
+ .itemInputs(
+ '16x ae2:molecular_assembler',
+ '4x #gtceu:circuits/luv',
+ '2x #gtceu:circuits/iv',
+ '8x megacells:accumulation_processor',
+ '8x ae2:logic_processor',
+ '2x gtceu:luv_conveyor_module',
+ '2x gtceu:luv_robot_arm',
+ '4x #forge:rods/long/rhodium_plated_palladium',)
+ .inputFluids(
+ Fluid.of('gtceu:soldering_alloy', 576),
+ Fluid.of('gtceu:polybenzimidazole', 1152),)
+ .itemOutputs('2x expatternprovider:ex_molecular_assembler')
+ .duration(200)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_molecular_assembler_zpm')
+ .itemInputs(
+ '32x ae2:molecular_assembler',
+ '4x #gtceu:circuits/zpm',
+ '2x #gtceu:circuits/luv',
+ '8x megacells:accumulation_processor',
+ '8x ae2:logic_processor',
+ '2x gtceu:zpm_conveyor_module',
+ '2x gtceu:zpm_robot_arm',
+ '4x #forge:rods/long/naquadah_alloy')
+ .inputFluids(
+ Fluid.of('gtceu:soldering_alloy', 576),
+ Fluid.of('gtceu:polybenzimidazole', 1152),)
+ .itemOutputs('4x expatternprovider:ex_molecular_assembler')
+ .duration(200)
+ .EUt(122880)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.assembly_line('expatternprovider:ex_molecular_assembler_uv')
+ .itemInputs(
+ '32x ae2:molecular_assembler',
+ '32x ae2:molecular_assembler',
+ '4x #gtceu:circuits/uv',
+ '2x #gtceu:circuits/zpm',
+ '8x megacells:accumulation_processor',
+ '8x ae2:logic_processor',
+ '2x gtceu:uv_conveyor_module',
+ '2x gtceu:uv_robot_arm',
+ '4x #forge:rods/long/darmstadtium')
+ .inputFluids(
+ Fluid.of('gtceu:soldering_alloy', 576),
+ Fluid.of('gtceu:polybenzimidazole', 1152),)
+ .itemOutputs('8x expatternprovider:ex_molecular_assembler')
+ .duration(200)
+ .EUt(491520)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+
+ //ex io port
+ event.recipes.gtceu.assembler('expatternprovider:ex_io_port')
+ .itemInputs(
+ 'gtceu:ev_machine_casing',
+ 'ae2:io_port',
+ '2x megacells:accumulation_processor',
+ '4x ae2:logic_processor',
+ '4x ae2:engineering_processor',
+ '4x ae2:speed_card',)
+ .itemOutputs('expatternprovider:ex_io_port')
+ .duration(200)
+ .EUt(1000)
+
+ event.recipes.gtceu.assembler('expatternprovider:ex_drive')
+ .itemInputs(
+ 'gtceu:ev_machine_casing',
+ 'ae2:drive',
+ '2x megacells:accumulation_processor',
+ '4x ae2:logic_processor',
+ '4x ae2:engineering_processor',
+ '2x ae2:capacity_card',)
+ .itemOutputs('expatternprovider:ex_drive')
+ .duration(200)
+ .EUt(1920)
+
+ event.recipes.gtceu.assembler('expatternprovider:ingredient_buffer')
+ .itemInputs(
+ 'gtceu:hv_machine_casing',
+ '2x ae2:quartz_vibrant_glass',
+ 'gtceu:stainless_steel_drum',
+ '2x ae2:cell_component_1k',
+ 'gtceu:hv_robot_arm',
+ 'gtceu:hv_electric_pump',)
+ .itemOutputs('expatternprovider:ingredient_buffer')
+ .duration(200)
+ .EUt(1920)
+
+ event.recipes.gtceu.assembler('expatternprovider:ex_charger')
+ .itemInputs(
+ '4x ae2:charger',
+ '4x ae2:storage_bus',
+ 'ae2:cable_interface',
+ '4x #forge:double_wires/uranium_triplatinum',
+ '4x ae2:logic_processor',
+ '4x ae2:engineering_processor',
+ '2x megacells:accumulation_processor',
+
+ )
+ .itemOutputs('expatternprovider:ex_charger')
+ .duration(200)
+ .EUt(1920)
+
+
+
+ }
\ No newline at end of file
diff --git a/kubejs/server_scripts/hotornot/recipes.js b/kubejs/server_scripts/hotornot/recipes.js
index c6438ed58..fa482ea64 100644
--- a/kubejs/server_scripts/hotornot/recipes.js
+++ b/kubejs/server_scripts/hotornot/recipes.js
@@ -7,4 +7,8 @@ const registerHotOrNotRecipes = (event) => {
event.remove({ id: 'tfchotornot/heating/tongs/cast_iron' })
event.remove({ id: 'tfchotornot:crafting/tongs/cast_iron' })
+
+
+ event.recipes.tfc.loom('tfchotornot:wool_potholder', '2x minecraft:blue_wool', 16, 'minecraft:block/white_wool')
+ .id('tfchotornot:loom/wool_potholder')
}
\ No newline at end of file
diff --git a/kubejs/server_scripts/mega_cells/recipes.js b/kubejs/server_scripts/mega_cells/recipes.js
index 152db211c..44046e0b7 100644
--- a/kubejs/server_scripts/mega_cells/recipes.js
+++ b/kubejs/server_scripts/mega_cells/recipes.js
@@ -2,373 +2,779 @@
const registerMegaCellsRecipes = (event) => {
- event.remove({ mod: 'megacells' })
+ event.remove({ not: [
+ {id: 'megacells:network/mega_pattern_provider_block'},
+ {id: 'megacells:network/mega_interface_block'},
+ {id: 'megacells:network/mega_interface_part'},
+ {id: 'megacells:network/mega_pattern_provider_part'},
+ ], mod: 'megacells' })
- // event.recipes.gtceu.assembler('')
- // .itemInputs('8x ae2:dense_energy_cell', '8x gtceu:nichrome_quadruple_wire', '4x #gtceu:circuits/iv')
- // .itemOutputs('megacells:mega_energy_cell')
- // .circuit(1)
- // .duration(960)
- // .EUt(2048)
+ event.recipes.gtceu.assembler('megacells:mega_energy_cell')
+ .itemInputs('8x ae2:dense_energy_cell', '8x gtceu:nichrome_quadruple_wire', '4x #gtceu:circuits/iv')
+ .itemOutputs('megacells:mega_energy_cell')
+ .circuit(1)
+ .duration(960)
+ .EUt(2048)
- /*
- event.remove({ id: 'megacells:crafting/mega_energy_cell' })
- event.remove({ id: 'megacells:crafting/sky_steel_block' })
- event.remove({ id: 'megacells:crafting/sky_steel_ingot_from_sky_steel_block' })
- event.remove({ id: 'megacells:transform/sky_steel_ingot' })
- event.remove({ id: 'megacells:inscriber/accumulation_processor_press' })
- event.remove({ id: 'megacells:inscriber/accumulation_processor_print' })
- event.remove({ id: 'megacells:inscriber/accumulation_processor_press_extra' })
- event.remove({ id: 'megacells:inscriber/accumulation_processor' })
- event.remove({ id: 'megacells:cells/mega_fluid_cell_housing' })
- event.remove({ id: 'megacells:cells/mega_item_cell_housing' })
- event.remove({ id: 'megacells:crafting/decompression_module' })
- event.remove({ id: 'megacells:cells/standard/bulk_item_cell' })
- event.remove({ id: 'megacells:crafting/bulk_cell_component' })
- event.remove({ id: 'megacells:crafting/compression_card' })
-*/
//printed accumulation circuit
+ event.recipes.gtceu.forming_press('megacells:printed_accumulation_processor')
+ .itemInputs('#forge:plates/enriched_naquadah')
+ .notConsumable('megacells:accumulation_processor_press')
+ .itemOutputs('megacells:printed_accumulation_processor')
+ .duration(20)
+ .EUt(1920)
- // event.recipes.gtceu.forming_press('megacells:printed_accumulation_processor')
- // .itemInputs('#forge:plates/enriched_naquadah')
- // .notConsumable('megacells:accumulation_processor_press')
- // .itemOutputs('megacells:printed_accumulation_processor')
- // .duration(20)
- // .EUt(1920)
+ // Inscrdiber Silicon Press
+ event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_iron')
+ .itemInputs('#forge:plates/iron', 'ae2:singularity')
+ .notConsumable('#forge:lenses/black')
+ .itemOutputs('megacells:accumulation_processor_press')
+ .duration(6000)
+ .EUt(1920)
- // // Inscrdiber Silicon Press
- // event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_iron')
- // .itemInputs('#forge:plates/iron', 'ae2:singularity')
- // .notConsumable('#forge:lenses/black')
- // .itemOutputs('megacells:accumulation_processor_press')
- // .duration(6000)
- // .EUt(1920)
+ event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_wrought_iron')
+ .itemInputs('#forge:plates/wrought_iron', 'ae2:singularity')
+ .notConsumable('#forge:lenses/black')
+ .itemOutputs('megacells:accumulation_processor_press')
+ .duration(4000)
+ .EUt(1920)
- // event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_wrought_iron')
- // .itemInputs('#forge:plates/wrought_iron', 'ae2:singularity')
- // .notConsumable('#forge:lenses/black')
- // .itemOutputs('megacells:accumulation_processor_press')
- // .duration(4000)
- // .EUt(1920)
+ //accumulation processor
+ event.recipes.gtceu.circuit_assembler('megacells:accumulation_processor')
+ .itemInputs(
+ 'ae2:printed_silicon',
+ 'megacells:printed_accumulation_processor',
+ '#gtceu:circuits/iv',
+ '2x #gtceu:resistors',
+ '2x #forge:fine_wires/niobium_titanium',)
+ .inputFluids(Fluid.of('tfg:fluix', 144))
+ .itemOutputs('2x megacells:accumulation_processor')
+ .duration(20)
+ .EUt(1920)
+ .cleanroom(CleanroomType.CLEANROOM)
- // //accumulation processor
- // event.recipes.gtceu.circuit_assembler('megacells:accumulation_processor')
- // .itemInputs(
- // 'ae2:printed_silicon',
- // 'megacells:printed_accumulation_processor',
- // '#gtceu:circuits/iv',
- // '2x #gtceu:resistors',
- // '2x #forge:fine_wires/niobium_titanium',)
- // .inputFluids(Fluid.of('gtceu:fluix', 144))
- // .itemOutputs('2x megacells:accumulation_processor')
- // .duration(20)
- // .EUt(1920)
- // .cleanroom(CleanroomType.CLEANROOM)
+ event.recipes.gtceu.circuit_assembler('megacells:accumulation_processor_adv')
+ .itemInputs(
+ 'ae2:printed_silicon',
+ 'megacells:printed_accumulation_processor',
+ '#gtceu:circuits/iv',
+ 'gtceu:advanced_smd_resistor',
+ '2x #forge:fine_wires/niobium_titanium',)
+ .inputFluids(Fluid.of('tfg:fluix', 144))
+ .itemOutputs('2x megacells:accumulation_processor')
+ .duration(20)
+ .EUt(1920)
+ .cleanroom(CleanroomType.CLEANROOM)
- // event.recipes.gtceu.circuit_assembler('megacells:accumulation_processor_adv')
- // .itemInputs(
- // 'ae2:printed_silicon',
- // 'megacells:printed_accumulation_processor',
- // '#gtceu:circuits/iv',
- // 'gtceu:advanced_smd_resistor',
- // '2x #forge:fine_wires/niobium_titanium',)
- // .inputFluids(Fluid.of('gtceu:fluix', 144))
- // .itemOutputs('2x megacells:accumulation_processor')
- // .duration(20)
- // .EUt(1920)
- // .cleanroom(CleanroomType.CLEANROOM)
-
- // /*
- // //Mega Item Cell Housing
- // event.shaped('megacells:mega_item_cell_housing', [
- // 'ABA',
- // 'CDC',
- // 'BBB'
- // ], {
- // A: 'ae2:quartz_vibrant_glass',
- // B: '#forge:plates/enriched_naquadah',
- // C: '#forge:fine_wires/niobium_titanium',
- // D: '#gtceu:circuits/iv',
- // }).id('tfg:crafting/mega_item_cell_housing')
+ //Mega Item Cell Housing
+ event.shaped('megacells:mega_item_cell_housing', [
+ 'ABA',
+ 'CDC',
+ 'BBB'
+ ], {
+ A: 'ae2:quartz_vibrant_glass',
+ B: '#forge:plates/enriched_naquadah',
+ C: '#forge:fine_wires/niobium_titanium',
+ D: '#gtceu:circuits/iv',
+ }).id('tfg:crafting/mega_item_cell_housing')
- // //Mega Fluid Cell Housing
- // event.shaped('megacells:mega_fluid_cell_housing', [
- // 'ABA',
- // 'CDC',
- // 'BBB'
- // ], {
- // A: 'ae2:quartz_vibrant_glass',
- // B: '#forge:plates/incoloy_ma_956',
- // C: '#forge:fine_wires/niobium_titanium',
- // D: '#gtceu:circuits/iv',
- // }).id('tfg:crafting/mega_fluid_cell_housing')
- // //#region Storage Components
- // // 1k storage components
- // event.recipes.gtceu.assembler('megacells:cell_component_1m')
- // .itemInputs(
- // '4x #gtceu:batteries/ulv',
- // '4x #forge:plates/wrought_iron',
- // '4x #forge:dusts/certus_quartz',
- // '2x megacells:accumulation_processor',)
- // .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
- // .itemOutputs('megacells:cell_component_1m')
- // .duration(200)
- // .EUt(480)
- // // 4k storage components
- // event.recipes.gtceu.assembler('megacells:cell_component_4m')
- // .itemInputs(
- // '4x #gtceu:circuits/ev',
- // '4x #forge:plates/titanium',
- // '4x #forge:dusts/certus_quartz',
- // '2x megacells:accumulation_processor')
- // .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
- // .itemOutputs('megacells:cell_component_4m')
- // .duration(200)
- // .EUt(1920)
- // .cleanroom(CleanroomType.CLEANROOM)
+ //Mega Fluid Cell Housing
+ event.shaped('megacells:mega_fluid_cell_housing', [
+ 'ABA',
+ 'CDC',
+ 'BBB'
+ ], {
+ A: 'ae2:quartz_vibrant_glass',
+ B: '#forge:plates/incoloy_ma_956',
+ C: '#forge:fine_wires/niobium_titanium',
+ D: '#gtceu:circuits/iv',
+ }).id('tfg:crafting/mega_fluid_cell_housing')
+
+ //cell dock
+ event.shaped('megacells:cell_dock', [
+ 'ABA',
+ 'CDC',
+ ], {
+ A: '#forge:plates/steel',
+ B: 'ae2:engineering_processor',
+ C: '#ae2:glass_cable',
+ D: '#gtceu:circuits/lv',
+ }).id('tfg:crafting/megacells_cell_dock')
+
+ //#region Storage Components
+
+ // 1m storage components
+ event.recipes.gtceu.assembly_line('megacells:cell_component_1m')
+ .itemInputs(
+ '4x #gtceu:circuits/uv',
+ '4x #forge:plates/darmstadtium',
+ '2x ae2:quartz_vibrant_glass',
+ '4x #forge:dusts/ender_pearl',
+ '4x ae2:matter_ball',
+ '2x megacells:accumulation_processor',)
+ .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
+ .itemOutputs('megacells:cell_component_1m')
+ .duration(200)
+ .EUt(491520)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // 4m storage components
+ event.recipes.gtceu.assembly_line('megacells:cell_component_4m')
+ .itemInputs(
+ '4x #gtceu:circuits/uhv',
+ '4x #forge:plates/neutronium',
+ '2x ae2:quartz_vibrant_glass',
+ '4x #forge:dusts/ender_pearl',
+ '4x ae2:matter_ball',
+ '2x megacells:accumulation_processor')
+ .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
+ .itemOutputs('megacells:cell_component_4m')
+ .duration(200)
+ .EUt(1966080)
+ .cleanroom(CleanroomType.CLEANROOM)
- // event.recipes.gtceu.assembler('megacells:cell_component_4m_1m')
+ event.recipes.gtceu.assembly_line('megacells:cell_component_4m_1m')
+ .itemInputs(
+ '2x megacells:accumulation_processor',
+ '2x #gtceu:circuits/uhv',
+ '2x ae2:quartz_vibrant_glass',
+ '4x megacells:cell_component_1m')
+ .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
+ .itemOutputs('megacells:cell_component_4m')
+ .duration(400)
+ .EUt(1966080)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 16m storage components
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_16m')
// .itemInputs(
- // '2x megacells:accumulation_processor',
- // '2x #gtceu:circuits/ev',
- // '4x megacells:cell_component_1m')
- // .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
- // .itemOutputs('megacells:cell_component_4m')
- // .duration(400)
- // .EUt(1920)
- // .cleanroom(CleanroomType.CLEANROOM)
- // // 16k storage components
- // event.recipes.gtceu.assembler('megacells:cell_component_16m')
- // .itemInputs(
- // '4x #gtceu:circuits/iv',
+ // '4x #gtceu:circuits/uev',
// '4x #forge:plates/tungsten_steel',
// '8x #forge:dusts/certus_quartz',
// '2x megacells:accumulation_processor',)
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_16m')
// .duration(200)
- // .EUt(7680)
+ // .EUt(7864320)
// .cleanroom(CleanroomType.CLEANROOM)
- // event.recipes.gtceu.assembler('megacells:cell_component_16m_4m')
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_16m_4m')
// .itemInputs(
// '2x megacells:accumulation_processor',
- // '2x #gtceu:circuits/iv',
+ // '2x #gtceu:circuits/uev',
// '4x megacells:cell_component_4m')
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_16m')
// .duration(400)
- // .EUt(7680)
+ // .EUt(7864320)
// .cleanroom(CleanroomType.CLEANROOM)
- // // 64k storage components
- // event.recipes.gtceu.assembler('megacells:cell_component_64m')
+ // // 64m storage components
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_64m')
// .itemInputs(
- // '4x #gtceu:circuits/luv',
+ // '4x #gtceu:circuits/uiv',
// '4x #forge:plates/rhodium_plated_palladium',
// '8x #forge:dusts/certus_quartz',
// '2x megacells:accumulation_processor')
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_64m')
// .duration(200)
- // .EUt(30720)
+ // .EUt(31457280)
// .cleanroom(CleanroomType.CLEANROOM)
- // event.recipes.gtceu.assembler('megacells:cell_component_64m_16m')
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_64m_16m')
// .itemInputs(
// '2x megacells:accumulation_processor',
- // '2x #gtceu:circuits/luv',
+ // '2x #gtceu:circuits/uiv',
// '4x megacells:cell_component_16m')
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_64m')
// .duration(400)
- // .EUt(30720)
+ // .EUt(31457280)
// .cleanroom(CleanroomType.CLEANROOM)
- // // 256k storage components
- // event.recipes.gtceu.assembler('megacells:cell_component_256m')
+ // // 256m storage components
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_256m')
// .itemInputs(
- // '4x #gtceu:circuits/zpm',
+ // '4x #gtceu:circuits/uxv',
// '4x #forge:plates/naquadah_alloy',
// '16x #forge:dusts/certus_quartz',
// '2x megacells:accumulation_processor',)
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_256m')
// .duration(200)
- // .EUt(122880)
+ // .EUt(125829120)
// .cleanroom(CleanroomType.CLEANROOM)
- // event.recipes.gtceu.assembler('megacells:cell_component_256m_64m')
+ // event.recipes.gtceu.assembly_line('megacells:cell_component_256m_64m')
// .itemInputs(
// '2x megacells:accumulation_processor',
- // '2x #gtceu:circuits/zpm',
+ // '2x #gtceu:circuits/uxv',
// '4x megacells:cell_component_64m')
// .inputFluids(Fluid.of('gtceu:hsla_steel', 144))
// .itemOutputs('megacells:cell_component_256m')
// .duration(400)
- // .EUt(122880)
+ // .EUt(125829120)
// .cleanroom(CleanroomType.CLEANROOM)
- // */
- // //#endregion
+ //#endregion
- // //#region MEGA interface
- // // EV
- // event.recipes.gtceu.assembler('megacells:mega_interface_ev')
- // .itemInputs(
- // '2x #ae2:interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:ev_conveyor_module',
- // '4x gtceu:laminated_glass',
- // '4x gtceu:titanium_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/ev')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('megacells:mega_interface')
- // .duration(300)
- // .EUt(1920)
+ //#region MEGA interface
+ // EV
+ event.recipes.gtceu.assembler('megacells:mega_interface_ev')
+ .itemInputs(
+ '2x #ae2:interface',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:ev_conveyor_module',
+ '4x gtceu:laminated_glass',
+ '4x gtceu:titanium_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/ev')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('megacells:mega_interface')
+ .duration(300)
+ .EUt(1920)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // IV
+ event.recipes.gtceu.assembler('megacells:mega_interface_iv')
+ .itemInputs(
+ '4x #ae2:interface',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:iv_conveyor_module',
+ '4x gtceu:laminated_glass',
+ '4x gtceu:tungsten_steel_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/iv',)
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('2x megacells:mega_interface')
+ .duration(300)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // LuV
+ event.recipes.gtceu.assembler('megacells:mega_interface_luv')
+ .itemInputs(
+ '8x #ae2:interface',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:luv_conveyor_module',
+ '4x gtceu:laminated_glass',
+ '4x gtceu:rhodium_plated_palladium_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/luv')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('4x megacells:mega_interface')
+ .duration(300)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // ZPM
+ event.recipes.gtceu.assembler('megacells:mega_interface_zpm')
+ .itemInputs(
+ '16x #ae2:interface',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:zpm_conveyor_module',
+ '4x gtceu:laminated_glass',
+ '4x gtceu:naquadah_alloy_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/zpm')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('8x megacells:mega_interface')
+ .duration(300)
+ .EUt(119680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+
+ //#region MEGA provider
+ // EV
+ event.recipes.gtceu.assembler('megacells:mega_pattern_provider_ev')
+ .itemInputs(
+ '2x #ae2:pattern_provider',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:ev_conveyor_module',
+ '4x gtceu:titanium_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/ev')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('megacells:mega_pattern_provider')
+ .duration(300)
+ .EUt(1920)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // IV
+ event.recipes.gtceu.assembler('megacells:mega_pattern_provider_iv')
+ .itemInputs(
+ '4x #ae2:pattern_provider',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:iv_conveyor_module',
+ '4x gtceu:tungsten_steel_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/iv',)
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('2x megacells:mega_pattern_provider')
+ .duration(300)
+ .EUt(7680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // LuV
+ event.recipes.gtceu.assembler('megacells:mega_pattern_provider_luv')
+ .itemInputs(
+ '8x #ae2:pattern_provider',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:luv_conveyor_module',
+ '4x gtceu:rhodium_plated_palladium_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/luv')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('4x megacells:mega_pattern_provider')
+ .duration(300)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // ZPM
+ event.recipes.gtceu.assembler('megacells:mega_pattern_provider_zpm')
+ .itemInputs(
+ '16x #ae2:pattern_provider',
+ '4x megacells:accumulation_processor',
+ '2x gtceu:zpm_conveyor_module',
+ '4x gtceu:naquadah_alloy_plate',
+ '2x ae2:annihilation_core',
+ '2x ae2:formation_core',
+ '#gtceu:circuits/zpm')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
+ .itemOutputs('8x megacells:mega_pattern_provider')
+ .duration(300)
+ .EUt(119680)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+
+ // greater energy card
+ event.recipes.gtceu.assembler('megacells:greater_energy_card')
+ .itemInputs(
+ 'ae2:energy_card',
+ '2x gtceu:lapotronic_energy_orb')
+ .itemOutputs('megacells:greater_energy_card')
+ .duration(200)
+ .EUt(1024)
+
+ //#region Cell Packing
+ //item
+ event.recipes.gtceu.packer('megacells:item_storage_cell_1m')
+ .itemInputs('megacells:mega_item_cell_housing', 'megacells:cell_component_1m')
+ .itemOutputs('megacells:item_storage_cell_1m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:item_storage_cell_4m')
+ .itemInputs('megacells:mega_item_cell_housing', 'megacells:cell_component_4m')
+ .itemOutputs('megacells:item_storage_cell_4m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_16m')
+ // .itemInputs('megacells:mega_item_cell_housing', 'megacells:cell_component_16m')
+ // .itemOutputs('megacells:item_storage_cell_16m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_64m')
+ // .itemInputs('megacells:mega_item_cell_housing', 'megacells:cell_component_64m')
+ // .itemOutputs('megacells:item_storage_cell_64m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_256m')
+ // .itemInputs('megacells:mega_item_cell_housing', 'megacells:cell_component_256m')
+ // .itemOutputs('megacells:item_storage_cell_256m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //fluid
+ event.recipes.gtceu.packer('megacells:fluid_storage_cell_1m')
+ .itemInputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_1m')
+ .itemOutputs('megacells:fluid_storage_cell_1m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:fluid_storage_cell_4m')
+ .itemInputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_4m')
+ .itemOutputs('megacells:fluid_storage_cell_4m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_16m')
+ // .itemInputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_16m')
+ // .itemOutputs('megacells:fluid_storage_cell_16m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_64m')
+ // .itemInputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_64m')
+ // .itemOutputs('megacells:fluid_storage_cell_64m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_256m')
+ // .itemInputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_256m')
+ // .itemOutputs('megacells:fluid_storage_cell_256m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //item back
+ event.recipes.gtceu.packer('megacells:item_storage_cell_1m_back')
+ .itemInputs('megacells:item_storage_cell_1m')
+ .itemOutputs('megacells:mega_item_cell_housing', 'megacells:cell_component_1m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:item_storage_cell_4m_back')
+ .itemInputs('megacells:item_storage_cell_4m')
+ .itemOutputs('megacells:mega_item_cell_housing', 'megacells:cell_component_4m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_16m_back')
+ // .itemInputs('megacells:item_storage_cell_16m')
+ // .itemOutputs('megacells:mega_item_cell_housing', 'megacells:cell_component_16m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_64m_back')
+ // .itemInputs('megacells:item_storage_cell_64m')
+ // .itemOutputs('megacells:mega_item_cell_housing', 'megacells:cell_component_64m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:item_storage_cell_256m_back')
+ // .itemInputs('megacells:item_storage_cell_256m')
+ // .itemOutputs('megacells:mega_item_cell_housing', 'megacells:cell_component_256m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //fluid back
+ event.recipes.gtceu.packer('megacells:fluid_storage_cell_1m_back')
+ .itemInputs('megacells:fluid_storage_cell_1m')
+ .itemOutputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_1m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:fluid_storage_cell_4m_back')
+ .itemInputs('megacells:fluid_storage_cell_4m')
+ .itemOutputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_4m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_16m_back')
+ // .itemInputs('megacells:fluid_storage_cell_16m')
+ // .itemOutputs('megacells:mega_fluid_cell_housing','megacells:cell_component_16m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_64m_back')
+ // .itemInputs('megacells:fluid_storage_cell_64m')
+ // .itemOutputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_64m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:fluid_storage_cell_256m_back')
+ // .itemInputs('megacells:fluid_storage_cell_256m')
+ // .itemOutputs('megacells:mega_fluid_cell_housing', 'megacells:cell_component_256m')
+ // .duration(10)
+ // .EUt(12)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+
+ //mega crafting unit
+ event.recipes.gtceu.assembler('megacells:mega_crafting_unit')
+ .itemInputs(
+ '4x ae2:crafting_unit',
+ '4x megacells:accumulation_processor',
+ '2x ae2:logic_processor',
+ '#gtceu:circuits/ev',
+ '2x ae2:fluix_smart_cable')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288))
+ .itemOutputs('megacells:mega_crafting_unit')
+ .duration(20)
+ .EUt(2720)
+
+
+ //#region Crafting Storage
+ event.recipes.gtceu.packer('megacells:mega_crafting_accelerator')
+ .itemInputs('megacells:mega_crafting_unit', 'ae2:engineering_processor')
+ .itemOutputs('megacells:mega_crafting_accelerator')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:1m_crafting_storage')
+ .itemInputs('megacells:mega_crafting_unit', 'megacells:cell_component_1m')
+ .itemOutputs('megacells:1m_crafting_storage')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:4m_crafting_storage')
+ .itemInputs('megacells:mega_crafting_unit', 'megacells:cell_component_4m')
+ .itemOutputs('megacells:4m_crafting_storage')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:16m_crafting_storage')
+ // .itemInputs('megacells:mega_crafting_unit', 'megacells:cell_component_16m')
+ // .itemOutputs('megacells:16m_crafting_storage')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // // IV
- // event.recipes.gtceu.assembler('megacells:mega_interface_iv')
- // .itemInputs(
- // '4x #ae2:interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:iv_conveyor_module',
- // '4x gtceu:laminated_glass',
- // '4x gtceu:tungsten_steel_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/iv',)
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('2x megacells:mega_interface')
- // .duration(300)
- // .EUt(7680)
+ // event.recipes.gtceu.packer('megacells:64m_crafting_storage')
+ // .itemInputs('megacells:mega_crafting_unit', 'megacells:cell_component_64m')
+ // .itemOutputs('megacells:64m_crafting_storage')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // // LuV
- // event.recipes.gtceu.assembler('megacells:mega_interface_luv')
- // .itemInputs(
- // '8x #ae2:interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:luv_conveyor_module',
- // '4x gtceu:laminated_glass',
- // '4x gtceu:rhodium_plated_palladium_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/luv')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('4x megacells:mega_interface')
- // .duration(300)
- // .EUt(30720)
+ // event.recipes.gtceu.packer('megacells:256m_crafting_storage')
+ // .itemInputs('megacells:mega_crafting_unit', 'megacells:cell_component_256m')
+ // .itemOutputs('megacells:256m_crafting_storage')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // // ZPM
- // event.recipes.gtceu.assembler('megacells:mega_interface_zpm')
- // .itemInputs(
- // '16x #ae2:interface',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:zpm_conveyor_module',
- // '4x gtceu:laminated_glass',
- // '4x gtceu:naquadah_alloy_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/zpm')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('8x megacells:mega_interface')
- // .duration(300)
- // .EUt(119680)
+ event.recipes.gtceu.packer('megacells:mega_crafting_monitor')
+ .itemInputs('megacells:mega_crafting_unit', 'ae2:storage_monitor')
+ .itemOutputs('megacells:mega_crafting_monitor')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //back
+ event.recipes.gtceu.packer('megacells:crafting_mega_accelerator_back')
+ .itemInputs('ae2:crafting_accelerator')
+ .itemOutputs('megacells:mega_crafting_unit', 'ae2:engineering_processor')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:1m_crafting_storage_back')
+ .itemInputs('megacells:1m_crafting_storage')
+ .itemOutputs('megacells:mega_crafting_unit', 'megacells:cell_component_1m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ event.recipes.gtceu.packer('megacells:4m_crafting_storage_back')
+ .itemInputs('megacells:4m_crafting_storage')
+ .itemOutputs('megacells:mega_crafting_unit', 'megacells:cell_component_4m')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // event.recipes.gtceu.packer('megacells:16m_crafting_storage_back')
+ // .itemInputs('megacells:16m_crafting_storage')
+ // .itemOutputs('megacells:mega_crafting_unit', 'megacells:cell_component_16m')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // //#endregion
-
- // //#region MEGA provider
- // // EV
- // event.recipes.gtceu.assembler('megacells:mega_pattern_provider_ev')
+ // event.recipes.gtceu.packer('megacells:64m_crafting_storage_back')
// .itemInputs(
- // '2x #ae2:pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:ev_conveyor_module',
- // '4x gtceu:titanium_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/ev')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('megacells:mega_pattern_provider')
- // .duration(300)
- // .EUt(1920)
+ // 'megacells:64m_crafting_storage')
+ // .itemOutputs('megacells:mega_crafting_unit','megacells:cell_component_64m')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // // IV
- // event.recipes.gtceu.assembler('megacells:mega_pattern_provider_iv')
- // .itemInputs(
- // '4x #ae2:pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:iv_conveyor_module',
- // '4x gtceu:tungsten_steel_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/iv',)
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('2x megacells:mega_pattern_provider')
- // .duration(300)
- // .EUt(7680)
+ // event.recipes.gtceu.packer('megacells:256m_crafting_storage_back')
+ // .itemInputs('megacells:256m_crafting_storage')
+ // .itemOutputs('megacells:mega_crafting_unit', 'megacells:cell_component_256m')
+ // .duration(10)
+ // .EUt(12)
// .cleanroom(CleanroomType.CLEANROOM)
- // // LuV
- // event.recipes.gtceu.assembler('megacells:mega_pattern_provider_luv')
+ event.recipes.gtceu.packer('megacells:crafting_monitor_back')
+ .itemInputs('megacells:mega_crafting_monitor')
+ .itemOutputs('megacells:mega_crafting_unit', 'ae2:storage_monitor')
+ .duration(10)
+ .EUt(12)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+
+ //#region Portable Cells
+
+
+ //#region Item
+
+ // 1m
+ event.recipes.gtceu.assembler('megacells:portable_item_cell_1m')
+ .itemInputs(
+ 'ae2:chest',
+ 'megacells:cell_component_1m',
+ 'megacells:mega_energy_cell',
+ '#gtceu:batteries/luv',
+ 'megacells:mega_item_cell_housing')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ .itemOutputs('megacells:portable_item_cell_1m')
+ .duration(200)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // 4m
+ event.recipes.gtceu.assembler('megacells:portable_item_cell_4m')
+ .itemInputs(
+ 'ae2:chest',
+ 'megacells:cell_component_4m',
+ 'megacells:mega_energy_cell',
+ '#gtceu:batteries/luv',
+ 'megacells:mega_item_cell_housing')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ .itemOutputs('megacells:portable_item_cell_4m')
+ .duration(200)
+ .EUt(122880)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // 16m
+ // event.recipes.gtceu.assembler('megacells:portable_item_cell_16m')
// .itemInputs(
- // '8x #ae2:pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:luv_conveyor_module',
- // '4x gtceu:rhodium_plated_palladium_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/luv')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('4x megacells:mega_pattern_provider')
- // .duration(300)
- // .EUt(30720)
- // .cleanroom(CleanroomType.CLEANROOM)
-
- // // ZPM
- // event.recipes.gtceu.assembler('megacells:mega_pattern_provider_zpm')
- // .itemInputs(
- // '16x #ae2:pattern_provider',
- // '4x megacells:accumulation_processor',
- // '2x gtceu:zpm_conveyor_module',
- // '4x gtceu:naquadah_alloy_plate',
- // '2x ae2:annihilation_core',
- // '2x ae2:formation_core',
- // '#gtceu:circuits/zpm')
- // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 1152))
- // .itemOutputs('8x megacells:mega_pattern_provider')
- // .duration(300)
- // .EUt(119680)
- // .cleanroom(CleanroomType.CLEANROOM)
-
- // //#endregion
-
- // // cable mega interface
- // event.shapeless('megacells:cable_mega_interface', ['megacells:mega_interface'])
- // .id('megacells:crafting/cable_mega_interface')
-
- // event.shapeless('megacells:mega_interface', ['megacells:cable_mega_interface'])
- // .id('megacells:crafting/mega_interface')
-
- // // cable mega pattern provider
- // event.shapeless('megacells:cable_mega_pattern_provider', ['megacells:mega_pattern_provider'])
- // .id('megacells:crafting/cable_mega_pattern_provider')
-
- // event.shapeless('megacells:mega_pattern_provider', ['megacells:cable_mega_pattern_provider'])
- // .id('megacells:crafting/mega_pattern_provider')
-
- // // greater energy card
- // event.recipes.gtceu.assembler('megacells:greater_energy_card')
- // .itemInputs(
- // 'ae2:energy_card',
- // '2x gtceu:lapotronic_energy_orb'
- // )
- // .itemOutputs('megacells:greater_energy_card')
+ // 'ae2:chest',
+ // 'megacells:cell_component_16m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_item_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_item_cell_16m')
// .duration(200)
- // .EUt(1024)
+ // .EUt(491520)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 64m
+ // event.recipes.gtceu.assembler('megacells:portable_item_cell_64m')
+ // .itemInputs(
+ // 'ae2:chest',
+ // 'megacells:cell_component_64m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_item_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_item_cell_64m')
+ // .duration(200)
+ // .EUt(1966080)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 256m
+ // event.recipes.gtceu.assembler('megacells:portable_item_cell_256m')
+ // .itemInputs(
+ // 'ae2:chest',
+ // 'megacells:cell_component_256m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_item_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_item_cell_256m')
+ // .duration(200)
+ // .EUt(7864320)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+ //#region Fluid
+ // 1m
+ event.recipes.gtceu.assembler('megacells:portable_fluid_cell_1m')
+ .itemInputs(
+ 'ae2:chest',
+ 'megacells:cell_component_1m',
+ 'megacells:mega_energy_cell',
+ '#gtceu:batteries/luv',
+ 'megacells:mega_fluid_cell_housing')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ .itemOutputs('megacells:portable_fluid_cell_1m')
+ .duration(200)
+ .EUt(30720)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // 4m
+ event.recipes.gtceu.assembler('megacells:portable_fluid_cell_4m')
+ .itemInputs(
+ 'ae2:chest',
+ 'megacells:cell_component_4m',
+ 'megacells:mega_energy_cell',
+ '#gtceu:batteries/luv',
+ 'megacells:mega_fluid_cell_housing')
+ .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ .itemOutputs('megacells:portable_fluid_cell_4m')
+ .duration(200)
+ .EUt(122880)
+ .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 16m
+ // event.recipes.gtceu.assembler('megacells:portable_fluid_cell_16m')
+ // .itemInputs(
+ // 'ae2:chest',
+ // 'megacells:cell_component_16m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_fluid_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_fluid_cell_16m')
+ // .duration(200)
+ // .EUt(491520)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 64m
+ // event.recipes.gtceu.assembler('megacells:portable_fluid_cell_64m')
+ // .itemInputs(
+ // 'ae2:chest',
+ // 'megacells:cell_component_64m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_fluid_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_fluid_cell_64m')
+ // .duration(200)
+ // .EUt(1966080)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ // // 256m
+ // event.recipes.gtceu.assembler('megacells:portable_fluid_cell_256m')
+ // .itemInputs(
+ // 'ae2:chest',
+ // 'megacells:cell_component_256m',
+ // 'megacells:mega_energy_cell',
+ // '#gtceu:batteries/luv',
+ // 'megacells:mega_fluid_cell_housing')
+ // .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
+ // .itemOutputs('megacells:portable_fluid_cell_256m')
+ // .duration(200)
+ // .EUt(7864320)
+ // .cleanroom(CleanroomType.CLEANROOM)
+
+ //#endregion
+ //#endregion
}
diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js
index 6b0ed577e..83fe2f62f 100644
--- a/kubejs/startup_scripts/ae2/constants.js
+++ b/kubejs/startup_scripts/ae2/constants.js
@@ -28,7 +28,6 @@ global.AE2_DISABLED_ITEMS = [
// Блоки
'ae2:vibration_chamber',
'ae2:crank',
- 'ae2:charger',
'ae2:spatial_anchor',
'ae2:inscriber',
'ae2:growth_accelerator',
diff --git a/kubejs/startup_scripts/extended_ae2/constants.js b/kubejs/startup_scripts/extended_ae2/constants.js
index 0e525ff7f..469fb8358 100644
--- a/kubejs/startup_scripts/extended_ae2/constants.js
+++ b/kubejs/startup_scripts/extended_ae2/constants.js
@@ -1,37 +1,39 @@
-// priority: 0
-
global.EXTENDED_AE2_DISABLED_ITEMS = [
- // 'expatternprovider:infinity_cell',
- // 'expatternprovider:fishbig',
- // 'expatternprovider:pattern_provider_upgrade',
- // 'expatternprovider:interface_upgrade',
- // 'expatternprovider:io_bus_upgrade',
- // 'expatternprovider:pattern_terminal_upgrade',
- // 'expatternprovider:drive_upgrade',
- // 'expatternprovider:ex_inscriber',
- // //в будущем будет крафт
- // 'expatternprovider:crystal_fixer',
- // 'expatternprovider:ex_charger',
- // 'expatternprovider:caner',
- // 'expatternprovider:ex_io_port',
- // 'expatternprovider:wireless_tool',
- // 'expatternprovider:wireless_connect',
- // 'expatternprovider:active_formation_plane',
- // 'expatternprovider:wireless_ex_pat',
- // 'expatternprovider:pattern_modifier',
- // 'expatternprovider:threshold_level_emitter',
+ 'expatternprovider:infinity_cell',
+ 'expatternprovider:fishbig',
+ 'expatternprovider:pattern_provider_upgrade',
+ 'expatternprovider:interface_upgrade',
+ 'expatternprovider:io_bus_upgrade',
+ 'expatternprovider:pattern_terminal_upgrade',
+ 'expatternprovider:drive_upgrade',
+ 'expatternprovider:ex_inscriber',
+ 'expatternprovider:crystal_fixer',
- // 'expatternprovider:ex_export_bus_part',
- // 'expatternprovider:ex_import_bus_part',
- // 'expatternprovider:ex_pattern_access_part',
- // 'expatternprovider:me_packing_tape',
- // 'expatternprovider:tag_storage_bus',
- // 'expatternprovider:tag_export_bus',
- // 'expatternprovider:mod_storage_bus',
- // 'expatternprovider:mod_export_bus',
- // 'expatternprovider:precise_export_bus',
- // 'expatternprovider:ingredient_buffer',
- // 'expatternprovider:ex_drive',
- // 'expatternprovider:ex_molecular_assembler',
-];
\ No newline at end of file
+ //в будущем будет крафт
+ /*
+ 'expatternprovider:ex_charger',
+ 'expatternprovider:caner',
+ 'expatternprovider:ex_io_port',
+ 'expatternprovider:wireless_tool',
+ 'expatternprovider:wireless_connect',
+ 'expatternprovider:active_formation_plane',
+ 'expatternprovider:wireless_ex_pat',
+ 'expatternprovider:pattern_modifier',
+ 'expatternprovider:threshold_level_emitter',
+
+ 'expatternprovider:ex_export_bus_part',
+ 'expatternprovider:ex_import_bus_part',
+ 'expatternprovider:ex_pattern_access_part',
+ 'expatternprovider:me_packing_tape',
+ 'expatternprovider:tag_storage_bus',
+ 'expatternprovider:tag_export_bus',
+ 'expatternprovider:mod_storage_bus',
+ 'expatternprovider:mod_export_bus',
+ 'expatternprovider:precise_export_bus',
+ 'expatternprovider:ingredient_buffer',
+ 'expatternprovider:ex_drive',
+ 'expatternprovider:ex_molecular_assembler',
+
+ */
+]
\ No newline at end of file
diff --git a/kubejs/startup_scripts/gtceu/material_info.js b/kubejs/startup_scripts/gtceu/material_info.js
new file mode 100644
index 000000000..07238979e
--- /dev/null
+++ b/kubejs/startup_scripts/gtceu/material_info.js
@@ -0,0 +1,37 @@
+// priority: 0
+
+const registerGTCEuMaterialInfo = (event) => {
+ //#region Дерево
+
+ global.VANILLA_WOOD_TYPES.forEach(woodType => {
+ event.remove(`minecraft:${woodType}_planks`)
+ event.remove(`minecraft:${woodType}_stairs`)
+ event.remove(`minecraft:${woodType}_slab`)
+ event.remove(`minecraft:${woodType}_fence`)
+ event.remove(`minecraft:${woodType}_fence_gate`)
+ event.remove(`minecraft:${woodType}_door`)
+ event.remove(`minecraft:${woodType}_button`)
+ event.remove(`minecraft:${woodType}_boat`)
+ })
+
+ // Сундуки
+ // removeMaterialInfo(Blocks.CHEST);
+ // removeMaterialInfo(Blocks.TRAPPED_CHEST);
+
+ // Верстаки
+ // removeMaterialInfo(Blocks.CRAFTING_TABLE);
+
+ //#endregion
+
+ // const testMaterial1 = GTMaterials.Copper;
+ // const testMaterial2 = GTMaterials.Tin;
+
+ // const b = new ItemMaterialInfo(
+ // new MaterialStack(testMaterial1, GTValues.M),
+ // new MaterialStack(testMaterial2, GTValues.M)
+ // );
+
+ // event.remove("minecraft:acacia_planks");
+
+ // event.add("minecraft:acacia_planks", b);
+};
diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js
index fcf3f4ac5..b36fa8b48 100644
--- a/kubejs/startup_scripts/main_startup_script.js
+++ b/kubejs/startup_scripts/main_startup_script.js
@@ -45,4 +45,11 @@ GTCEuStartupEvents.registry('gtceu:recipe_type', event => {
*/
GTCEuStartupEvents.registry('gtceu:machine', event => {
registerGTCEuMachines(event)
-})
\ No newline at end of file
+})
+
+/**
+ * Событие регистрации информации о составе предмета.
+ */
+// TFGStartupEvents.materialInfo(event => {
+// registerGTCEuMaterialInfo(event)
+// })
\ No newline at end of file
diff --git a/kubejs/startup_scripts/mega_cells/constants.js b/kubejs/startup_scripts/mega_cells/constants.js
index 904459952..1f85f8c7d 100644
--- a/kubejs/startup_scripts/mega_cells/constants.js
+++ b/kubejs/startup_scripts/mega_cells/constants.js
@@ -1,50 +1,36 @@
// priority: 0
global.MEGA_CELLS_DISABLED_ITEMS = [
- // 'megacells:mega_energy_cell',
- // 'megacells:sky_steel_block',
- // 'megacells:sky_steel_ingot',
+ 'megacells:sky_steel_block',
+ 'megacells:sky_steel_ingot',
- // 'megacells:decompression_module',
- // 'megacells:bulk_item_cell',
- // 'megacells:bulk_cell_component',
- // 'megacells:compression_card',
+ 'megacells:decompression_module',
+ 'megacells:bulk_item_cell',
+ 'megacells:bulk_cell_component',
+ 'megacells:compression_card',
- // 'megacells:cell_component_1m',
- // 'megacells:cell_component_4m',
- // 'megacells:cell_component_16m',
- // 'megacells:cell_component_64m',
- // 'megacells:cell_component_256m',
- // 'megacells:item_storage_cell_1m',
- // 'megacells:item_storage_cell_4m',
- // 'megacells:item_storage_cell_16m',
- // 'megacells:item_storage_cell_64m',
- // 'megacells:item_storage_cell_256m',
- // 'megacells:fluid_storage_cell_1m',
- // 'megacells:fluid_storage_cell_4m',
- // 'megacells:fluid_storage_cell_16m',
- // 'megacells:fluid_storage_cell_64m',
- // 'megacells:fluid_storage_cell_256m',
- // 'megacells:portable_item_cell_1m',
- // 'megacells:portable_item_cell_4m',
- // 'megacells:portable_item_cell_16m',
- // 'megacells:portable_item_cell_64m',
- // 'megacells:portable_item_cell_256m',
- // 'megacells:portable_fluid_cell_1m',
- // 'megacells:portable_fluid_cell_4m',
- // 'megacells:portable_fluid_cell_16m',
- // 'megacells:portable_fluid_cell_64m',
- // 'megacells:portable_fluid_cell_256m',
- // 'megacells:1m_crafting_storage',
- // 'megacells:4m_crafting_storage',
- // 'megacells:16m_crafting_storage',
- // 'megacells:64m_crafting_storage',
- // 'megacells:256m_crafting_storage',
- // 'megacells:mega_crafting_unit',
- // 'megacells:mega_crafting_monitor',
- // 'megacells:mega_crafting_accelerator',
- // 'megacells:cell_dock',
+ 'megacells:cell_component_16m',
+ 'megacells:cell_component_64m',
+ 'megacells:cell_component_256m',
- // 'megacells:mega_item_cell_housing',
- // 'megacells:mega_fluid_cell_housing',
-];
\ No newline at end of file
+ 'megacells:item_storage_cell_16m',
+ 'megacells:item_storage_cell_64m',
+ 'megacells:item_storage_cell_256m',
+
+ 'megacells:fluid_storage_cell_16m',
+ 'megacells:fluid_storage_cell_64m',
+ 'megacells:fluid_storage_cell_256m',
+
+ 'megacells:portable_item_cell_16m',
+ 'megacells:portable_item_cell_64m',
+ 'megacells:portable_item_cell_256m',
+,
+ 'megacells:portable_fluid_cell_16m',
+ 'megacells:portable_fluid_cell_64m',
+ 'megacells:portable_fluid_cell_256m',
+
+ 'megacells:16m_crafting_storage',
+ 'megacells:64m_crafting_storage',
+ 'megacells:256m_crafting_storage',
+
+]
\ No newline at end of file
diff --git a/mods b/mods
index 794d9d76c..aa86a797d 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit 794d9d76c92d2eccc591c63aeccc1d98354ee6f3
+Subproject commit aa86a797d808936b39cb85714a8a1169ce5077a6