diff --git a/.gitattributes b/.gitattributes index a8bf972bf..0bb5bcff7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ # Default to LF for all files -* text=auto eol=lf \ No newline at end of file +* text=auto \ No newline at end of file diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index 3d2d297dc..90553cd97 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -16,298 +16,8 @@ "projectID": 385053, "files": [ { - "projectID": 280510, - "fileID": 4911084, - "required": true - }, - { - "projectID": 686911, - "fileID": 5076080, - "required": true - }, - { - "projectID": 387638, - "fileID": 4691333, - "required": true - }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, - { - "projectID": 404465, - "fileID": 5051953, - "required": true - }, - { - "projectID": 238222, - "fileID": 5074448, - "required": true - }, - { - "projectID": 738663, - "fileID": 4742680, - "required": true - }, - { - "projectID": 351441, - "fileID": 4613538, - "required": true - }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 858542, - "fileID": 4779110, - "required": true - }, - { - "projectID": 790626, - "fileID": 5077298, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 526854, - "fileID": 4631193, - "required": true - }, - { - "projectID": 513402, - "fileID": 5095301, - "required": true - }, - { - "projectID": 240633, - "fileID": 4655091, - "required": true - }, - { - "projectID": 286633, - "fileID": 4582171, - "required": true - }, - { - "projectID": 324717, - "fileID": 5072729, - "required": true - }, - { - "projectID": 231095, - "fileID": 4787442, - "required": true - }, - { - "projectID": 282001, - "fileID": 5072630, - "required": true - }, - { - "projectID": 419699, - "fileID": 5084452, - "required": true - }, - { - "projectID": 302973, - "fileID": 5096511, - "required": true - }, - { - "projectID": 495476, - "fileID": 5074812, - "required": true - }, - { - "projectID": 233019, - "fileID": 4578262, - "required": true - }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 688231, - "fileID": 4836196, - "required": true - }, - { - "projectID": 283644, - "fileID": 5098182, - "required": true - }, - { - "projectID": 581495, - "fileID": 5080444, - "required": true - }, - { - "projectID": 288885, - "fileID": 4711423, - "required": true - }, - { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 625069, - "fileID": 4603343, - "required": true - }, - { - "projectID": 433760, - "fileID": 5093745, - "required": true - }, - { - "projectID": 841001, - "fileID": 4945181, - "required": true - }, - { - "projectID": 580555, - "fileID": 5096955, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 499980, - "fileID": 5094714, - "required": true - }, - { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 422301, - "fileID": 5080847, - "required": true - }, - { - "projectID": 550678, - "fileID": 4627738, - "required": true - }, - { - "projectID": 459701, - "fileID": 4766090, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 366140, - "fileID": 4597074, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 266890, - "fileID": 5095414, - "required": true - }, - { - "projectID": 916493, - "fileID": 4988266, - "required": true - }, - { - "projectID": 931925, - "fileID": 5051407, - "required": true - }, - { - "projectID": 689467, - "fileID": 5097611, - "required": true - }, - { - "projectID": 238086, - "fileID": 5085508, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 459929, - "fileID": 4936437, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 676136, - "fileID": 4607206, - "required": true - }, - { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 317780, - "fileID": 5073804, - "required": true - }, - { - "projectID": 286924, - "fileID": 4973871, - "required": true - }, - { - "projectID": 636608, - "fileID": 4982660, - "required": true - }, - { - "projectID": 416089, - "fileID": 5069050, + "projectID": 429371, + "fileID": 4884096, "required": true }, { @@ -315,284 +25,19 @@ "fileID": 5083995, "required": true }, - { - "projectID": 833233, - "fileID": 4734074, - "required": true - }, - { - "projectID": 890405, - "fileID": 5083343, - "required": true - }, { "projectID": 475117, "fileID": 4711435, "required": true }, { - "projectID": 828656, - "fileID": 4932788, + "projectID": 416294, + "fileID": 4944325, "required": true }, { - "projectID": 289412, - "fileID": 5084753, - "required": true - }, - { - "projectID": 309927, - "fileID": 5086821, - "required": true - }, - { - "projectID": 407206, - "fileID": 5064431, - "required": true - }, - { - "projectID": 570017, - "fileID": 4825247, - "required": true - }, - { - "projectID": 658722, - "fileID": 4594978, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 714158, - "fileID": 5064065, - "required": true - }, - { - "projectID": 831663, - "fileID": 4894789, - "required": true - }, - { - "projectID": 908741, - "fileID": 5077202, - "required": true - }, - { - "projectID": 326652, - "fileID": 5063785, - "required": true - }, - { - "projectID": 537533, - "fileID": 4957373, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 60089, - "fileID": 4581240, - "required": true - }, - { - "projectID": 333287, - "fileID": 5076779, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, - { - "projectID": 820815, - "fileID": 5046696, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 241160, - "fileID": 4939735, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 439890, - "fileID": 5070244, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 272335, - "fileID": 4990314, - "required": true - }, - { - "projectID": 544096, - "fileID": 4688989, - "required": true - }, - { - "projectID": 431430, - "fileID": 4731559, - "required": true - }, - { - "projectID": 255389, - "fileID": 4798205, - "required": true - }, - { - "projectID": 367706, - "fileID": 5028692, - "required": true - }, - { - "projectID": 233071, - "fileID": 4939240, - "required": true - }, - { - "projectID": 223794, - "fileID": 5032144, - "required": true - }, - { - "projectID": 880532, - "fileID": 4895948, - "required": true - }, - { - "projectID": 280294, - "fileID": 4586784, - "required": true - }, - { - "projectID": 922713, - "fileID": 5077849, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 570630, - "fileID": 5096206, - "required": true - }, - { - "projectID": 663658, - "fileID": 5056153, - "required": true - }, - { - "projectID": 314905, - "fileID": 4596742, - "required": true - }, - { - "projectID": 952112, - "fileID": 5064493, - "required": true - }, - { - "projectID": 618298, - "fileID": 5080836, - "required": true - }, - { - "projectID": 882495, - "fileID": 4884976, - "required": true - }, - { - "projectID": 263420, - "fileID": 5060708, - "required": true - }, - { - "projectID": 256717, - "fileID": 4614555, - "required": true - }, - { - "projectID": 844019, - "fileID": 5077247, - "required": true - }, - { - "projectID": 943925, - "fileID": 4926070, - "required": true - }, - { - "projectID": 891816, - "fileID": 5064623, - "required": true - }, - { - "projectID": 670986, - "fileID": 5093785, - "required": true - }, - { - "projectID": 674852, - "fileID": 4828026, - "required": true - }, - { - "projectID": 312664, - "fileID": 4745380, - "required": true - }, - { - "projectID": 495693, - "fileID": 4870168, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, + "projectID": 231095, + "fileID": 4787442, "required": true }, { @@ -600,64 +45,44 @@ "fileID": 4608859, "required": true }, + { + "projectID": 882495, + "fileID": 4884976, + "required": true + }, + { + "projectID": 658722, + "fileID": 4594978, + "required": true + }, + { + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 433760, + "fileID": 5093745, + "required": true + }, + { + "projectID": 416089, + "fileID": 5093322, + "required": true + }, { "projectID": 549394, "fileID": 4606534, "required": true }, { - "projectID": 254284, - "fileID": 5056167, + "projectID": 531761, + "fileID": 4943500, "required": true }, { - "projectID": 404468, - "fileID": 4623116, - "required": true - }, - { - "projectID": 871755, - "fileID": 5091568, - "required": true - }, - { - "projectID": 250398, - "fileID": 4646682, - "required": true - }, - { - "projectID": 662156, - "fileID": 4944918, - "required": true - }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 964322, - "fileID": 5096394, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 633412, - "fileID": 5016280, - "required": true - }, - { - "projectID": 453394, - "fileID": 5086231, + "projectID": 326652, + "fileID": 5063785, "required": true }, { @@ -666,8 +91,8 @@ "required": true }, { - "projectID": 297038, - "fileID": 5087386, + "projectID": 511770, + "fileID": 4606615, "required": true }, { @@ -675,10 +100,575 @@ "fileID": 5093473, "required": true }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 738663, + "fileID": 4742680, + "required": true + }, + { + "projectID": 286633, + "fileID": 4582171, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 922713, + "fileID": 5077849, + "required": true + }, + { + "projectID": 289412, + "fileID": 5084753, + "required": true + }, + { + "projectID": 266890, + "fileID": 5095414, + "required": true + }, + { + "projectID": 366140, + "fileID": 4597074, + "required": true + }, + { + "projectID": 263420, + "fileID": 5060708, + "required": true + }, + { + "projectID": 286924, + "fileID": 4973871, + "required": true + }, { "projectID": 410295, "fileID": 5028413, "required": true + }, + { + "projectID": 233071, + "fileID": 4939240, + "required": true + }, + { + "projectID": 272335, + "fileID": 4990314, + "required": true + }, + { + "projectID": 890405, + "fileID": 5083343, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, + "required": true + }, + { + "projectID": 223794, + "fileID": 5032144, + "required": true + }, + { + "projectID": 306770, + "fileID": 4966125, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 317780, + "fileID": 5073804, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 570630, + "fileID": 5096206, + "required": true + }, + { + "projectID": 831663, + "fileID": 4894789, + "required": true + }, + { + "projectID": 676136, + "fileID": 4607206, + "required": true + }, + { + "projectID": 633412, + "fileID": 5016280, + "required": true + }, + { + "projectID": 550678, + "fileID": 4627738, + "required": true + }, + { + "projectID": 238086, + "fileID": 5085508, + "required": true + }, + { + "projectID": 790626, + "fileID": 5077298, + "required": true + }, + { + "projectID": 686911, + "fileID": 5076080, + "required": true + }, + { + "projectID": 297038, + "fileID": 5087386, + "required": true + }, + { + "projectID": 367706, + "fileID": 5028692, + "required": true + }, + { + "projectID": 324717, + "fileID": 5072729, + "required": true + }, + { + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 250398, + "fileID": 4646682, + "required": true + }, + { + "projectID": 580555, + "fileID": 5096955, + "required": true + }, + { + "projectID": 431430, + "fileID": 4731559, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 309927, + "fileID": 5086821, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 302973, + "fileID": 5096511, + "required": true + }, + { + "projectID": 943925, + "fileID": 4926070, + "required": true + }, + { + "projectID": 419699, + "fileID": 5084452, + "required": true + }, + { + "projectID": 714158, + "fileID": 5064065, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 282001, + "fileID": 5072630, + "required": true + }, + { + "projectID": 964322, + "fileID": 5075951, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 283644, + "fileID": 5098182, + "required": true + }, + { + "projectID": 439890, + "fileID": 5070244, + "required": true + }, + { + "projectID": 288885, + "fileID": 4711423, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 459701, + "fileID": 4766090, + "required": true + }, + { + "projectID": 833233, + "fileID": 4734074, + "required": true + }, + { + "projectID": 663658, + "fileID": 5056153, + "required": true + }, + { + "projectID": 407206, + "fileID": 5064431, + "required": true + }, + { + "projectID": 952112, + "fileID": 5064493, + "required": true + }, + { + "projectID": 312664, + "fileID": 4745380, + "required": true + }, + { + "projectID": 570017, + "fileID": 4825247, + "required": true + }, + { + "projectID": 410811, + "fileID": 4896152, + "required": true + }, + { + "projectID": 844019, + "fileID": 5077247, + "required": true + }, + { + "projectID": 495476, + "fileID": 5074812, + "required": true + }, + { + "projectID": 280510, + "fileID": 4911084, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 499980, + "fileID": 5094714, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 820815, + "fileID": 5046696, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 636608, + "fileID": 4982660, + "required": true + }, + { + "projectID": 280294, + "fileID": 4586784, + "required": true + }, + { + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 351441, + "fileID": 4613538, + "required": true + }, + { + "projectID": 333287, + "fileID": 5076779, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 453394, + "fileID": 5086231, + "required": true + }, + { + "projectID": 254284, + "fileID": 5056167, + "required": true + }, + { + "projectID": 459929, + "fileID": 4936437, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 891816, + "fileID": 5064623, + "required": true + }, + { + "projectID": 662156, + "fileID": 4944918, + "required": true + }, + { + "projectID": 537533, + "fileID": 4957373, + "required": true + }, + { + "projectID": 674852, + "fileID": 4828026, + "required": true + }, + { + "projectID": 513402, + "fileID": 5098472, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, + { + "projectID": 828656, + "fileID": 4932788, + "required": true + }, + { + "projectID": 618298, + "fileID": 5080836, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 422301, + "fileID": 5080847, + "required": true + }, + { + "projectID": 241160, + "fileID": 4939735, + "required": true + }, + { + "projectID": 908741, + "fileID": 5077202, + "required": true + }, + { + "projectID": 625069, + "fileID": 4603343, + "required": true + }, + { + "projectID": 880532, + "fileID": 4895948, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 256717, + "fileID": 4614555, + "required": true + }, + { + "projectID": 238222, + "fileID": 5074448, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 404465, + "fileID": 5051953, + "required": true + }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 237307, + "fileID": 4600191, + "required": true + }, + { + "projectID": 233019, + "fileID": 4578262, + "required": true + }, + { + "projectID": 670986, + "fileID": 5093785, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 689467, + "fileID": 5097611, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 871755, + "fileID": 5091568, + "required": true + }, + { + "projectID": 858542, + "fileID": 4779110, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 581495, + "fileID": 5080444, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true } ], "overrides": "overrides" diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index ad5107055..857ebed58 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,135 +1,133 @@