diff --git a/.github/buildtools/client_mod.txt b/.github/buildtools/client_mod.txt index 9f1c38387..2a1493bfb 100644 --- a/.github/buildtools/client_mod.txt +++ b/.github/buildtools/client_mod.txt @@ -17,6 +17,7 @@ clienttweaks* clientcrafting* CTM* Controlling* +chat_heads* darkness-forge* defaultoptions* dynamiclights* diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index cf790fdd4..0d91b32d5 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": 880630, + "fileID": 5367372, + "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": 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..cfdef845e 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 2625ffcf2..b85a04a6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,50 @@ # Changelog -## [0.7.10] - 23.05.2024 -### Fixes -- Probably fixed strange shit, when items could dispawn VERY quickly (1-2mins) (by deleting KryptonReforged as incompat with embeddium). -### New mods -- ? +## [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/README.md b/README.md index 04dbc093f..a33f10612 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
- + Chat on Discord 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/ftbqoptimizer.snbt b/config/ftbqoptimizer.snbt new file mode 100644 index 000000000..a62cf278c --- /dev/null +++ b/config/ftbqoptimizer.snbt @@ -0,0 +1,13 @@ +# FTBQuestOptimizer config file +# If you're a modpack maker, edit defaultconfigs/ftbqoptimizer-server.snbt instead + +{ + # Enable optimization of quest completion detection + # Default: true + detect_optimization: true + + # Number of tick skips for checking player inventories, 0 to disable tick skipping. Experiment and find the best value for you! + # Default: 5 + # Range: 0 ~ 100 + skip_ticks_amount: 5 +} diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 8bedc65d3..35afe8591 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -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/gtceu.yaml b/config/gtceu.yaml index 838925cdf..613f02ac1 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -14,16 +14,16 @@ recipes: # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. # Default: false - harderBrickRecipes: true + harderBrickRecipes: false # Whether to nerf Wood crafting to 2 Planks from 1 Log, and 2 Sticks from 2 Planks. # Default: false - nerfWoodCrafting: true + nerfWoodCrafting: false # Whether to make Wood related recipes harder. # Excludes sticks and planks. # Default: false - hardWoodRecipes: true + hardWoodRecipes: false # Recipes for Buckets, Cauldrons, Hoppers, and Iron Bars require Iron Plates, Rods, and more. # Default: true @@ -31,16 +31,16 @@ recipes: # Whether to make Redstone related recipes harder. # Default: false - hardRedstoneRecipes: true + hardRedstoneRecipes: false # Whether to make Vanilla Tools and Armor recipes harder. # Excludes Flint and Steel, and Buckets. # Default: false - hardToolArmorRecipes: true + hardToolArmorRecipes: false # Whether to make miscellaneous recipes harder. # Default: false - hardMiscRecipes: true + hardMiscRecipes: false # Whether to make Glass related recipes harder. Default: true hardGlassRecipes: true @@ -51,7 +51,7 @@ recipes: # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more. # Default: false - hardAdvancedIronRecipes: true + hardAdvancedIronRecipes: false # Whether to make coloring blocks like Concrete or Glass harder. # Default: false @@ -79,7 +79,7 @@ recipes: # Whether to nerf the output amounts of the first circuit in a set to 1 (from 2) and SoC to 2 (from 4). # Default: false - harderCircuitRecipes: true + harderCircuitRecipes: false worldgen: # Rubber Tree spawn chance (% per chunk) 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/packetfixer.properties b/config/packetfixer.properties new file mode 100644 index 000000000..aef18f342 --- /dev/null +++ b/config/packetfixer.properties @@ -0,0 +1,7 @@ +#Packet Fixer config file. +#Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576 and decoderSize 2097152. +#Max values are 2147483647 for packetSize/decoderSize and 9223372036854775807 for nbtMaxSize. +#Mon May 27 00:20:51 YEKT 2024 +nbtMaxSize=209715200 +decoderSize=838860800 +packetSize=104857600 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/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/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/mods b/mods index a75c00e6e..33660624d 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit a75c00e6ebd58cc3863b381f554495a26d162a27 +Subproject commit 33660624d042995a34d07f540681785fb38bf5c1