From ae57cbe9b9933620260b0fdceae127cde0ac8928 Mon Sep 17 00:00:00 2001 From: mina <143211829+ursamina@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:36:29 +0000 Subject: [PATCH] export into cf form github is now legible for other people (hooray) --- manifest.json | 345 ++++++++++++++++++ modlist.html | 67 ++++ {config => overrides/config}/MouseTweaks.cfg | 0 {config => overrides/config}/ae2/client.json | 0 {config => overrides/config}/ae2/common.json | 0 .../config}/attributefix.json | 0 {config => overrides/config}/balm-common.toml | 0 .../config}/buildinggadgets2-common.toml | 0 .../config}/clienttweaks-common.toml | 0 .../config}/craftingstation-client.toml | 0 .../config}/craftingtweaks-common.toml | 0 .../config}/curios-client.toml | 0 .../config}/embeddium-mixins.properties | 0 .../config}/embeddium-options.json | 0 .../config}/expatternprovider-common.toml | 0 {config => overrides/config}/fastsuite.cfg | 0 .../config}/ferritecore-mixin.toml | 0 {config => overrides/config}/findme.json | 0 {config => overrides/config}/fml.toml | 0 .../config}/forge-client.toml | 0 .../config}/fpsreducer/fpsreducer-client.toml | 0 .../config}/framedblocks-client.toml | 0 .../config}/framedblocks-common.toml | 0 .../ftbquests/quests/chapter_groups.snbt | 0 .../quests/chapters/ev__extreme_voltage.snbt | 180 +++++---- .../ftbquests/quests/chapters/gtceu.snbt | 0 .../quests/chapters/heating_coils.snbt | 0 .../quests/chapters/hv__high_voltage.snbt | 48 ++- .../quests/chapters/iv__insane_voltage.snbt | 94 +++-- .../chapters/luv__ludicrous_voltage.snbt | 20 +- .../quests/chapters/lv__low_voltage.snbt | 2 +- .../quests/chapters/multiblock_dilemma.snbt | 0 .../quests/chapters/mv__medium_voltage.snbt | 2 +- .../quests/chapters/ore_generation.snbt | 0 .../quests/chapters/progression.snbt | 0 .../ftbquests/quests/chapters/steam_age.snbt | 0 .../quests/chapters/tips_and_tricks_2.snbt | 2 +- .../quests/chapters/uv__ultimate_voltage.snbt | 18 +- .../chapters/zpm__zero_point_module.snbt | 19 +- .../config}/ftbquests/quests/data.snbt | 0 .../quests/reward_tables/bronze_age.snbt | 0 overrides/config/ftbxmodcompat.snbt | 13 + {config => overrides/config}/gtceu.yaml | 0 .../config}/hangglider-client.toml | 0 .../config}/hangglider-server.toml | 0 .../config}/inventoryessentials-common.toml | 0 .../config}/inventorysorter-client.toml | 0 .../config}/jade/hide-blocks.json | 0 .../config}/jade/hide-entities.json | 0 {config => overrides/config}/jade/jade.json | 0 .../config}/jade/plugins.json | 0 .../config}/jade/sort-order.json | 0 .../config}/modelfix-client.toml | 0 .../config}/modernfix-common.toml | 0 .../config}/modernfix-mixins.properties | 1 + .../config}/patchouli-client.toml | 0 .../config}/polymorph-integrations.toml | 0 .../config}/shimmer-client.toml | 0 .../config}/sidebar_buttons.json | 0 .../config}/simplemagnets-common.toml | 0 {config => overrides/config}/smoothboot.json | 0 .../config}/storagedrawers-client.toml | 0 .../config}/storagedrawers-common.toml | 0 .../config}/toastcontrol-common.toml | 0 .../config}/toolbelt-client.toml | 0 .../config}/toolbelt-common.toml | 0 {config => overrides/config}/torchmaster.toml | 0 overrides/config/xaerominimap-common.txt | 4 + overrides/config/xaerominimap.txt | 133 +++++++ overrides/config/xaerominimap_entities.json | 191 ++++++++++ overrides/config/xaeropatreon.txt | 0 overrides/config/xaeroworldmap-common.txt | 3 + overrides/config/xaeroworldmap.txt | 55 +++ .../items/recipestudy/clay_overview.png | Bin .../kubejs}/assets/gtceu/lang/en_us.json | 0 .../assets/kubejs/textures/item/greg_icon.png | Bin .../kubejs}/client_scripts/example.js | 0 .../kubejs}/client_scripts/jei_hidden.js | 0 .../kubejs}/config/client.properties | 0 .../kubejs}/config/common.properties | 0 .../kubejs}/config/packicon.png | Bin .../server_scripts/appliedenergistics2/ae2.js | 0 .../appliedenergistics2/cables.js | 0 .../appliedenergistics2/cards.js | 0 .../appliedenergistics2/cells.js | 0 .../appliedenergistics2/certus_quartz.js | 0 .../appliedenergistics2/circuitry.js | 0 .../appliedenergistics2/crafting_storage.js | 0 .../appliedenergistics2/extendedae2.js | 0 .../appliedenergistics2/inter_providers.js | 0 .../molecular_assemblers.js | 0 .../appliedenergistics2/patterns.js | 0 .../appliedenergistics2/portable_cells.js | 0 .../appliedenergistics2/pressing.js | 0 .../appliedenergistics2/removals.js | 0 .../appliedenergistics2/storage_parts.js | 0 .../appliedenergistics2/terminals.js | 0 .../building_gadgets/gadgets.js | 0 .../crafting_station/recipes.js | 0 .../kubejs}/server_scripts/elden_ring.js | 0 .../server_scripts/gregtech/components.js | 0 .../server_scripts/gregtech/greenhouse.js | 0 .../server_scripts/gregtech/inscriber.js | 0 .../kubejs}/server_scripts/gregtech/tools.js | 0 .../gregtech/wood_unification.js | 0 .../server_scripts/open_blocks/elevator.js | 0 .../server_scripts/open_blocks/hang_glider.js | 0 .../server_scripts/open_blocks/magnets.js | 0 .../kubejs}/server_scripts/removals.js | 0 .../server_scripts/storage_drawers/drawers.js | 0 .../storage_drawers/upgrades.js | 0 .../kubejs}/server_scripts/tags/ae2.js | 0 .../kubejs}/server_scripts/tags/gregtech.js | 0 .../kubejs}/server_scripts/tags/items.js | 0 .../server_scripts/tool_belt/recipes.js | 0 .../kubejs}/server_scripts/torchmaster.js | 0 .../server_scripts/vanilla/loot_drops.js | 0 .../server_scripts/vanilla/mob_drops.js | 0 .../startup_scripts/components/hsla-steel.js | 0 .../kubejs}/startup_scripts/icons.js | 0 .../startup_scripts/machinery/greenhouse.js | 0 .../material_testing/material.js | 0 .../startup_scripts/recipes/greenhouse.js | 0 123 files changed, 1067 insertions(+), 130 deletions(-) create mode 100644 manifest.json create mode 100644 modlist.html rename {config => overrides/config}/MouseTweaks.cfg (100%) rename {config => overrides/config}/ae2/client.json (100%) rename {config => overrides/config}/ae2/common.json (100%) rename {config => overrides/config}/attributefix.json (100%) rename {config => overrides/config}/balm-common.toml (100%) rename {config => overrides/config}/buildinggadgets2-common.toml (100%) rename {config => overrides/config}/clienttweaks-common.toml (100%) rename {config => overrides/config}/craftingstation-client.toml (100%) rename {config => overrides/config}/craftingtweaks-common.toml (100%) rename {config => overrides/config}/curios-client.toml (100%) rename {config => overrides/config}/embeddium-mixins.properties (100%) rename {config => overrides/config}/embeddium-options.json (100%) rename {config => overrides/config}/expatternprovider-common.toml (100%) rename {config => overrides/config}/fastsuite.cfg (100%) rename {config => overrides/config}/ferritecore-mixin.toml (100%) rename {config => overrides/config}/findme.json (100%) rename {config => overrides/config}/fml.toml (100%) rename {config => overrides/config}/forge-client.toml (100%) rename {config => overrides/config}/fpsreducer/fpsreducer-client.toml (100%) rename {config => overrides/config}/framedblocks-client.toml (100%) rename {config => overrides/config}/framedblocks-common.toml (100%) rename {config => overrides/config}/ftbquests/quests/chapter_groups.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/ev__extreme_voltage.snbt (89%) rename {config => overrides/config}/ftbquests/quests/chapters/gtceu.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/heating_coils.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/hv__high_voltage.snbt (92%) rename {config => overrides/config}/ftbquests/quests/chapters/iv__insane_voltage.snbt (94%) rename {config => overrides/config}/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt (98%) rename {config => overrides/config}/ftbquests/quests/chapters/lv__low_voltage.snbt (99%) rename {config => overrides/config}/ftbquests/quests/chapters/multiblock_dilemma.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/mv__medium_voltage.snbt (99%) rename {config => overrides/config}/ftbquests/quests/chapters/ore_generation.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/progression.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/steam_age.snbt (100%) rename {config => overrides/config}/ftbquests/quests/chapters/tips_and_tricks_2.snbt (99%) rename {config => overrides/config}/ftbquests/quests/chapters/uv__ultimate_voltage.snbt (98%) rename {config => overrides/config}/ftbquests/quests/chapters/zpm__zero_point_module.snbt (99%) rename {config => overrides/config}/ftbquests/quests/data.snbt (100%) rename {config => overrides/config}/ftbquests/quests/reward_tables/bronze_age.snbt (100%) create mode 100644 overrides/config/ftbxmodcompat.snbt rename {config => overrides/config}/gtceu.yaml (100%) rename {config => overrides/config}/hangglider-client.toml (100%) rename {config => overrides/config}/hangglider-server.toml (100%) rename {config => overrides/config}/inventoryessentials-common.toml (100%) rename {config => overrides/config}/inventorysorter-client.toml (100%) rename {config => overrides/config}/jade/hide-blocks.json (100%) rename {config => overrides/config}/jade/hide-entities.json (100%) rename {config => overrides/config}/jade/jade.json (100%) rename {config => overrides/config}/jade/plugins.json (100%) rename {config => overrides/config}/jade/sort-order.json (100%) rename {config => overrides/config}/modelfix-client.toml (100%) rename {config => overrides/config}/modernfix-common.toml (100%) rename {config => overrides/config}/modernfix-mixins.properties (98%) rename {config => overrides/config}/patchouli-client.toml (100%) rename {config => overrides/config}/polymorph-integrations.toml (100%) rename {config => overrides/config}/shimmer-client.toml (100%) rename {config => overrides/config}/sidebar_buttons.json (100%) rename {config => overrides/config}/simplemagnets-common.toml (100%) rename {config => overrides/config}/smoothboot.json (100%) rename {config => overrides/config}/storagedrawers-client.toml (100%) rename {config => overrides/config}/storagedrawers-common.toml (100%) rename {config => overrides/config}/toastcontrol-common.toml (100%) rename {config => overrides/config}/toolbelt-client.toml (100%) rename {config => overrides/config}/toolbelt-common.toml (100%) rename {config => overrides/config}/torchmaster.toml (100%) create mode 100644 overrides/config/xaerominimap-common.txt create mode 100644 overrides/config/xaerominimap.txt create mode 100644 overrides/config/xaerominimap_entities.json create mode 100644 overrides/config/xaeropatreon.txt create mode 100644 overrides/config/xaeroworldmap-common.txt create mode 100644 overrides/config/xaeroworldmap.txt rename {kubejs => overrides/kubejs}/assets/ftbquests/textures/items/recipestudy/clay_overview.png (100%) rename {kubejs => overrides/kubejs}/assets/gtceu/lang/en_us.json (100%) rename {kubejs => overrides/kubejs}/assets/kubejs/textures/item/greg_icon.png (100%) rename {kubejs => overrides/kubejs}/client_scripts/example.js (100%) rename {kubejs => overrides/kubejs}/client_scripts/jei_hidden.js (100%) rename {kubejs => overrides/kubejs}/config/client.properties (100%) rename {kubejs => overrides/kubejs}/config/common.properties (100%) rename {kubejs => overrides/kubejs}/config/packicon.png (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/ae2.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/cables.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/cards.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/cells.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/certus_quartz.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/circuitry.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/crafting_storage.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/extendedae2.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/inter_providers.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/molecular_assemblers.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/patterns.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/portable_cells.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/pressing.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/removals.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/storage_parts.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/appliedenergistics2/terminals.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/building_gadgets/gadgets.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/crafting_station/recipes.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/elden_ring.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/gregtech/components.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/gregtech/greenhouse.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/gregtech/inscriber.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/gregtech/tools.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/gregtech/wood_unification.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/open_blocks/elevator.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/open_blocks/hang_glider.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/open_blocks/magnets.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/removals.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/storage_drawers/drawers.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/storage_drawers/upgrades.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/tags/ae2.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/tags/gregtech.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/tags/items.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/tool_belt/recipes.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/torchmaster.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/vanilla/loot_drops.js (100%) rename {kubejs => overrides/kubejs}/server_scripts/vanilla/mob_drops.js (100%) rename {kubejs => overrides/kubejs}/startup_scripts/components/hsla-steel.js (100%) rename {kubejs => overrides/kubejs}/startup_scripts/icons.js (100%) rename {kubejs => overrides/kubejs}/startup_scripts/machinery/greenhouse.js (100%) rename {kubejs => overrides/kubejs}/startup_scripts/material_testing/material.js (100%) rename {kubejs => overrides/kubejs}/startup_scripts/recipes/greenhouse.js (100%) diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..88b6591 --- /dev/null +++ b/manifest.json @@ -0,0 +1,345 @@ +{ + "minecraft": { + "version": "1.20.1", + "modLoaders": [ + { + "id": "forge-47.2.0", + "primary": true + } + ] + }, + "manifestType": "minecraftModpack", + "manifestVersion": 1, + "name": "GregTech CEu Modern Community Pack", + "version": "1.0.0", + "author": "ursamina", + "projectID": 0, + "files": [ + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 694231, + "fileID": 4864808, + "required": true + }, + { + "projectID": 548115, + "fileID": 4721662, + "required": true + }, + { + "projectID": 348521, + "fileID": 4633444, + "required": true + }, + { + "projectID": 630620, + "fileID": 4706149, + "required": true + }, + { + "projectID": 438332, + "fileID": 4715408, + "required": true + }, + { + "projectID": 280294, + "fileID": 4586784, + "required": true + }, + { + "projectID": 394140, + "fileID": 4794200, + "required": true + }, + { + "projectID": 238222, + "fileID": 4712868, + "required": true + }, + { + "projectID": 634062, + "fileID": 4610474, + "required": true + }, + { + "projectID": 271740, + "fileID": 4711316, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 441647, + "fileID": 4793884, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 454372, + "fileID": 4927036, + "required": true + }, + { + "projectID": 870210, + "fileID": 4848244, + "required": true + }, + { + "projectID": 238086, + "fileID": 4948967, + "required": true + }, + { + "projectID": 291936, + "fileID": 4960678, + "required": true + }, + { + "projectID": 280510, + "fileID": 4911084, + "required": true + }, + { + "projectID": 890405, + "fileID": 4924346, + "required": true + }, + { + "projectID": 790626, + "fileID": 4949413, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 495476, + "fileID": 4924184, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 419699, + "fileID": 4663010, + "required": true + }, + { + "projectID": 676136, + "fileID": 4607206, + "required": true + }, + { + "projectID": 250832, + "fileID": 4837768, + "required": true + }, + { + "projectID": 230976, + "fileID": 4620069, + "required": true + }, + { + "projectID": 324717, + "fileID": 4961520, + "required": true + }, + { + "projectID": 309927, + "fileID": 4960408, + "required": true + }, + { + "projectID": 309674, + "fileID": 4838266, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 627824, + "fileID": 4923047, + "required": true + }, + { + "projectID": 904974, + "fileID": 4801662, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 318551, + "fileID": 4770683, + "required": true + }, + { + "projectID": 250398, + "fileID": 4646682, + "required": true + }, + { + "projectID": 314906, + "fileID": 4925796, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 892005, + "fileID": 4962674, + "required": true + }, + { + "projectID": 228525, + "fileID": 4958302, + "required": true + }, + { + "projectID": 233071, + "fileID": 4939240, + "required": true + }, + { + "projectID": 633412, + "fileID": 4685319, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 852668, + "fileID": 4710223, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 223794, + "fileID": 4857895, + "required": true + }, + { + "projectID": 858542, + "fileID": 4779110, + "required": true + }, + { + "projectID": 254268, + "fileID": 4817795, + "required": true + }, + { + "projectID": 615134, + "fileID": 4784395, + "required": true + }, + { + "projectID": 520110, + "fileID": 4953572, + "required": true + }, + { + "projectID": 388800, + "fileID": 4928442, + "required": true + }, + { + "projectID": 404465, + "fileID": 4864329, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, + { + "projectID": 370890, + "fileID": 4803995, + "required": true + }, + { + "projectID": 635427, + "fileID": 4680832, + "required": true + }, + { + "projectID": 256717, + "fileID": 4614555, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, + "required": true + }, + { + "projectID": 908741, + "fileID": 4949986, + "required": true + }, + { + "projectID": 298187, + "fileID": 4843616, + "required": true + }, + { + "projectID": 368825, + "fileID": 4752151, + "required": true + } + ], + "overrides": "overrides" +} diff --git a/modlist.html b/modlist.html new file mode 100644 index 0000000..371d809 --- /dev/null +++ b/modlist.html @@ -0,0 +1,67 @@ + diff --git a/config/MouseTweaks.cfg b/overrides/config/MouseTweaks.cfg similarity index 100% rename from config/MouseTweaks.cfg rename to overrides/config/MouseTweaks.cfg diff --git a/config/ae2/client.json b/overrides/config/ae2/client.json similarity index 100% rename from config/ae2/client.json rename to overrides/config/ae2/client.json diff --git a/config/ae2/common.json b/overrides/config/ae2/common.json similarity index 100% rename from config/ae2/common.json rename to overrides/config/ae2/common.json diff --git a/config/attributefix.json b/overrides/config/attributefix.json similarity index 100% rename from config/attributefix.json rename to overrides/config/attributefix.json diff --git a/config/balm-common.toml b/overrides/config/balm-common.toml similarity index 100% rename from config/balm-common.toml rename to overrides/config/balm-common.toml diff --git a/config/buildinggadgets2-common.toml b/overrides/config/buildinggadgets2-common.toml similarity index 100% rename from config/buildinggadgets2-common.toml rename to overrides/config/buildinggadgets2-common.toml diff --git a/config/clienttweaks-common.toml b/overrides/config/clienttweaks-common.toml similarity index 100% rename from config/clienttweaks-common.toml rename to overrides/config/clienttweaks-common.toml diff --git a/config/craftingstation-client.toml b/overrides/config/craftingstation-client.toml similarity index 100% rename from config/craftingstation-client.toml rename to overrides/config/craftingstation-client.toml diff --git a/config/craftingtweaks-common.toml b/overrides/config/craftingtweaks-common.toml similarity index 100% rename from config/craftingtweaks-common.toml rename to overrides/config/craftingtweaks-common.toml diff --git a/config/curios-client.toml b/overrides/config/curios-client.toml similarity index 100% rename from config/curios-client.toml rename to overrides/config/curios-client.toml diff --git a/config/embeddium-mixins.properties b/overrides/config/embeddium-mixins.properties similarity index 100% rename from config/embeddium-mixins.properties rename to overrides/config/embeddium-mixins.properties diff --git a/config/embeddium-options.json b/overrides/config/embeddium-options.json similarity index 100% rename from config/embeddium-options.json rename to overrides/config/embeddium-options.json diff --git a/config/expatternprovider-common.toml b/overrides/config/expatternprovider-common.toml similarity index 100% rename from config/expatternprovider-common.toml rename to overrides/config/expatternprovider-common.toml diff --git a/config/fastsuite.cfg b/overrides/config/fastsuite.cfg similarity index 100% rename from config/fastsuite.cfg rename to overrides/config/fastsuite.cfg diff --git a/config/ferritecore-mixin.toml b/overrides/config/ferritecore-mixin.toml similarity index 100% rename from config/ferritecore-mixin.toml rename to overrides/config/ferritecore-mixin.toml diff --git a/config/findme.json b/overrides/config/findme.json similarity index 100% rename from config/findme.json rename to overrides/config/findme.json diff --git a/config/fml.toml b/overrides/config/fml.toml similarity index 100% rename from config/fml.toml rename to overrides/config/fml.toml diff --git a/config/forge-client.toml b/overrides/config/forge-client.toml similarity index 100% rename from config/forge-client.toml rename to overrides/config/forge-client.toml diff --git a/config/fpsreducer/fpsreducer-client.toml b/overrides/config/fpsreducer/fpsreducer-client.toml similarity index 100% rename from config/fpsreducer/fpsreducer-client.toml rename to overrides/config/fpsreducer/fpsreducer-client.toml diff --git a/config/framedblocks-client.toml b/overrides/config/framedblocks-client.toml similarity index 100% rename from config/framedblocks-client.toml rename to overrides/config/framedblocks-client.toml diff --git a/config/framedblocks-common.toml b/overrides/config/framedblocks-common.toml similarity index 100% rename from config/framedblocks-common.toml rename to overrides/config/framedblocks-common.toml diff --git a/config/ftbquests/quests/chapter_groups.snbt b/overrides/config/ftbquests/quests/chapter_groups.snbt similarity index 100% rename from config/ftbquests/quests/chapter_groups.snbt rename to overrides/config/ftbquests/quests/chapter_groups.snbt diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/overrides/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt similarity index 89% rename from config/ftbquests/quests/chapters/ev__extreme_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 3d1587d..92da991 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -1,4 +1,5 @@ { + autofocus_id: "01E88C8523658529" default_hide_dependency_lines: false default_quest_shape: "" filename: "ev__extreme_voltage" @@ -48,17 +49,17 @@ { dependencies: ["16B735F9C391D260"] description: [ - "However... if we were honest... Steam as a power option really isn't worth it at this point anymore. " + "It's time to be blunt - Steam as a power option really isn't worth it at this point anymore. " "" - "The &3Large Steam Turbine&r is a multiblock Steam Turbine for &6HV&r power. It's quite an expensive multiblock to build just to generate a measly 1024 EU/t, but it also boasts the powerful ability to scale to &9higher Power Production and higher Efficiency&r." + "The &3Large Steam Turbine&r acts as a multiblock Steam Turbine for &6HV&r power. It's quite an expensive multiblock to build just for a measly 1024 EU/t, but it also boasts the powerful ability to scale to &9higher Power Production and higher Efficiency&r." "{@pagebreak}" - "The Turbine will output &dDistilled Water&r if given an &3Output Hatch&r. You can loop this back to your &3Large Boilers&r. We don't entirely endorse this, as your Boilers will end up exploding if the system fails..." + "The Turbine outputs &dDistilled Water&r if given an &3Output Hatch&r, which you could loop back to your &3Large Boilers&r. We don't entirely endorse this, as your Boilers will end up exploding if the system fails." "" - "Each Large Turbine will require a &aTurbine Rotor&r and a &3Rotor Holder&r. More on the Turbine mechanics in the &lnext&r Quest." + "Each Large Turbine will require a &aTurbine Rotor&r and a &3Rotor Holder&r. You can find out more about the Turbine mechanics in the &lnext&r Quest." "{@pagebreak}" - "&9Note:&r This Quest &eonly&r requires the Controller, but you still need all the multiblock parts to construct the Turbine." + "&9Note:&r This Quest &eonly&r requires the Controller, but you'll still need all the multiblock parts to construct the Turbine." "" - "Turbines &cvoid&r energy if they're unable to output. If you plan on using this with HV power, use a Rotor with close to 100% Power stat." + "Turbines &cvoid&r energy if they're unable to output. If you plan on using this with &6HV&r power, use a Rotor close to a 100% Power stat." ] icon: "gtceu:steam_large_turbine" id: "189F84D6C76CDC8B" @@ -366,11 +367,19 @@ id: "69E384F389B0D07B" shape: "rsquare" size: 0.66d - tasks: [{ - id: "3DF109921CA21ADB" - item: "gtceu:lapotron_crystal" - type: "item" - }] + tasks: [ + { + id: "3DF109921CA21ADB" + item: "gtceu:lapotron_crystal" + type: "item" + } + { + id: "486FD2A6FCEFDFEF" + item: "gtceu:ev_lapotronic_battery" + optional_task: true + type: "item" + } + ] title: "Extreme Batteries" x: 4.5d y: 1.125d @@ -448,7 +457,7 @@ { dependencies: ["478B0D55369C0F7F"] description: [ - "&aTungstensteel&r is composed half of Steel... suffice to say, you will need large quantities of both &aIron&r and &aTungsten&r!" + "&aTungstensteel&r is composed half of Steel... suffice to say, you'll need large quantities of both &aIron&r and &aTungsten&r!" "" "Right now, you will need it for &3Energy&r or &3Dynamo Hatches&r... one step closer to moving away from those pesky single block Generators." "" @@ -529,7 +538,7 @@ "" "You'll need to make use of many new &9alloys&r to build the new Multiblocks. Yay, more content!" "" - "&6This quest unlocks a new tutorial on the GCYM mechanics the &lTips and Tricks&r&6 tab - check it out to learn more!&r" + "&6This quest unlocks a new tutorial on the GCYM mechanics in the &lTips and Tricks&r&6 tab - check it out to learn more!&r" ] icon: "gtceu:vibration_safe_casing" id: "3B2D2C47BEBCFFA7" @@ -542,7 +551,7 @@ }] title: "Gregicality Multiblocks" x: 9.0d - y: 6.75d + y: 6.6d } { dependencies: [ @@ -1166,7 +1175,7 @@ value: "forge:ingots/plutonium" } } - title: "Any #forge:ingots/plutonium" + title: "Plutonium Ingot" type: "item" } { @@ -1222,13 +1231,13 @@ { dependencies: ["390E59F05132FCB8"] description: [ - "Go for the &3LCR&r recipe." + "You're going to want to use the &3LCR&r recipe for your first &aEpichlorohydrin&r." "" - "This requires &aPropene&r, which means &dOil Processing&r and &dFuel Cracking&r are necessary. Sorry if you had been putting that off..." + "This recipe requires &aPropene&r, which means that &dOil Processing&r and &dFuel Cracking&r are now necessary ventures. We're truly sorry if you've been dragging your heels!" "" - "We highly recommend that you get the &3Distillation Tower&r before progressing in this direction." + "It's quite important that you make your first &3Distillation Tower&r before progressing to the right." "" - "If you hadn't noticed, you can loop the &dSalt Water&r for the &dSodium Hydroxide&r." + "Last of all, if you haven't noticed, you can loop the &dSalt Water&r byproduct to bootstrap the &dSodium Hydroxide&r." ] id: "1F571B9E1555DA04" shape: "rsquare" @@ -1249,18 +1258,24 @@ "Obtain &aPhenol&r from:" "" "&91 -&r &aWood Tar&r distillation." - "&92 -&r Reacting &aBenzene&r with &dChlorine&r and &dSodium Hydroxide&r (performed in an &3LCR&r, Chlorine is perfectly looped)." - "&93 -&r Doing the above shortcut recipe which skips using &dSodium Hydroxide&r, but is lossy on &dChlorine&r." - "&94 -&r Reacting &aBenzene&r, &dPropene&r and &dOxygen&r using a small amount of &4Phosphoric Acid&r, normally a catalyst, but consumed in small quantity. This is called the Cumene process." - "{@pagebreak}" - "If you're having trouble deciding between the options presented, here's why each route could suit you:" "" - "&91 -&r Great if you have &3Pyrolyse&r + &3Distillation Tower&r combo." - "&92 -&r Our preference! You can use the &dSalt&r to make &dSalt Water&r and electrolyze it as a loop." - "&93 -&r Great if you have infinite supply of &dChlorine&r thanks to a &3Fluid Drilling Rig&r on Salt Water." - "&94 -&r &4Phosphoric Acid&r is a pain to produce. You'd be mad to consider this." + "&92 -&r Reacting &aBenzene&r with &dChlorine&r and &dSodium Hydroxide&r This should be performed in an &3LCR&r, and the Chlorine is perfectly looped." + "" + "&93 -&r Shortcutting the above recipe by ignoring the &dSodium Hydroxide&r. This is net negative on &dChlorine&r." + "" + "&94 -&r Reacting &aBenzene&r, &dPropene&r and &dOxygen&r using a small amount of &4Phosphoric Acid&r - normally a catalyst, but consumed here in small quantities. This is called the Cumene process." "{@pagebreak}" - "&l&3Lore:&r&o The Benzene + Oxygen recipe was added in GTCE as part of its chemical fixes, as the Large Chemical Reactor didn't exist. Now that there are more realistic options, that recipe might be removed." + "If you're having trouble deciding between the options presented, here's the appeal of each route:" + "" + "&91 -&r Great if you're willing to set up a &3Pyrolyse Oven&r + &3Distillation Tower&r combo." + "" + "&92 -&r This one's our preference! You can use the &dSalt&r to make more &dSalt Water&r, then electrolyze to create a loop." + "" + "&93 -&r Very appealing if you have an infinite supply of &dChlorine&r. You could achieve this by setting up a &3Fluid Drilling Rig&r on a Salt Water vein." + "" + "&94 -&r ...&4Phosphoric Acid&r is a pain to produce. You'd be mad to consider this." + "{@pagebreak}" + "&l&3Lore:&r&o The Benzene + Oxygen recipe was added in GTCE with the intent of fixing missing chemical recipes, as the Large Chemical Reactor didn't exist. Now that CEu provides more realistic options, we may remove the recipe in future." ] id: "4CD9F6D1B4CC7D81" shape: "rsquare" @@ -1306,13 +1321,11 @@ description: [ "Silicone Rubber has its uses in Cable insulation, Conveyor recipes, and more." "" - "We would recommend holding off for now, as it's a pretty severe &dChlorine&r sink." - "" - "Collect &eany&r of these forms of Rubber to complete this Quest." + "You may want to shelve this quest for now, as tackling Silicone Rubber can be a pretty severe &dChlorine&r sink." "{@pagebreak}" - "&9Note:&r Rubber will have to be replaced with either &a&aSilicone Rubber&r or &aStyrene-Butadienne Rubber&r for &1IV&r Cables." + "&9Note:&r Rubber will eventually be usurped by either &aSilicone Rubber&r or &aStyrene-Butadienne Rubber&r for &1IV&r Cables." "" - "Both &aSilicone Rubber&r and &aStyrene-Butadienne Rubber&r will be required in &dLuV&r." + "Both these rubbers will be required once you make it to &dLuV&r." ] icon: "gtceu:silicone_rubber_plate" id: "1A4AD56965407DC5" @@ -1323,6 +1336,7 @@ amount: 1296L fluid: "gtceu:silicone_rubber" id: "3C29253DA5DAF778" + optional_task: true type: "fluid" } { @@ -1334,7 +1348,8 @@ value: "forge:ingots/silicone_rubber" } } - title: "Any #forge:ingots/silicone_rubber" + optional_task: true + title: "Silicone Rubber Ingot" type: "item" } { @@ -1346,7 +1361,7 @@ value: "forge:plates/silicone_rubber" } } - title: "Any #forge:plates/silicone_rubber" + title: "Silicone Rubber Plate" type: "item" } ] @@ -1361,13 +1376,11 @@ "" "It can be used in place of Rubber in most recipes, and is &6four times more efficient&r at &ainsulating Cables&r. It is also strictly required for certain higher-tier recipes." "" - "This isn't exactly worth making until you get the &3Distillation Tower&r, but it eventually becomes great with &dFuel Cracking&r." - "" - "Collect &eany&r of these forms of Rubber to complete this Quest." + "This isn't exactly worth making until you get the &3Distillation Tower&r, but it eventually becomes easier with &dFuel Cracking&r." "{@pagebreak}" - "&9Note:&r Rubber will have to be replaced with either &a&aSilicone Rubber&r or &aStyrene-Butadiene Rubber&r for &1IV&r Cables." + "&9Note:&r Rubber will eventually be usurped by either &aSilicone Rubber&r or &aStyrene-Butadienne Rubber&r for &1IV&r Cables." "" - "Both &aSilicone Rubber&r and &aStyrene-Butadiene Rubber&r will be required in &dLuV&r." + "Both these rubbers will be required once you make it to &dLuV&r." ] id: "77070668969E31BF" size: 0.75d @@ -1682,28 +1695,6 @@ x: 0.0d y: 10.125d } - { - dependencies: ["39E7997F3080250A"] - description: [ - "To turn a P2P Tunnel into a &aGTEU P2P Tunnel&r, right-click it in the world with a &dWire&r or &dCable&r." - "" - "This is ideal in lategame situations to save you from spamming Cables or Transformers. You can also use them in conjunction with the AE2 Quantum Bridge to power your high tier Miners and Drills outside your base." - "" - "There is a &45% Voltage Tax&r on the output side of the P2P, resulting in 5% energy loss." - ] - icon: "ae2:me_p2p_tunnel" - id: "4793384CD9764AC6" - shape: "rsquare" - size: 0.66d - subtitle: "EU and U: Transferring energy" - tasks: [{ - id: "6EEAAFA1EAC9DEDA" - type: "checkmark" - }] - title: "GTEU P2P Tunnels" - x: 7.875d - y: 5.625d - } { dependencies: ["39E7997F3080250A"] description: [ @@ -1738,6 +1729,69 @@ x: 7.875d y: 4.5d } + { + dependencies: ["3B2D2C47BEBCFFA7"] + description: [ + "The &aAlloy Blast Smelter&r is the only main &2GCYM&r machine available in &5EV&r. You can use it to produce any alloy that you'd normally use the Mixer for. " + "" + "Instead of producing &6Hot Ingots&r, the ABS produces &9Molten Fluids&r if the recipe is \"hot\" enough. These fluids require cooling with a &bVacuum Freezer&r. Otherwise, it produces regular liquids." + "" + "Don't let the long smelting times scare you off. This machine incorporates the &dMixer step&r directly into the smelting recipe, and actually saves you quite a bit of time over smelting the dust in an EBF!" + "" + "Nearly every &2GCYM&r material is produced in this machine, so if you have trouble finding a Mixer recipe, look for a Molten Fluid!" + "{@pagebreak}" + "&l&3Lore:&r&o This multiblock was inspired by GT++. It didn't use any heating coils, had no temperature requirements, and only produced regular liquids for all materials. It was pretty OP back in the day, but it eventually got restricted to only a single Energy Hatch to balance it out. For some reason, it also allowed you to melt any dust... into liquid...?" + ] + id: "5979B0E13A1EDC9C" + shape: "square" + size: 0.75d + subtitle: "Visions of GT++" + tasks: [{ + id: "1493AF342D999313" + item: "gtceu:alloy_blast_smelter" + type: "item" + }] + x: 7.875d + y: 6.75d + } + { + dependencies: ["3B2D2C47BEBCFFA7"] + description: [ + "You probably have some old machines lying around, right?" + "" + "You most likely know by now that Arc Furnaces can recycle machines, but by &5EV&r, they upgrade to &a9 slots&r!" + "" + "&eNote&r: This quest accepts either an &5EV&r or &9IV&r Arc Furnace. You don't have to make both." + ] + icon: "gtceu:iv_arc_furnace" + id: "6FEF59B8F571359D" + shape: "rsquare" + size: 0.66d + tasks: [{ + id: "35CAC76B502E12FF" + item: { + Count: 1b + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:ev_arc_furnace" + } + { + Count: 1b + id: "gtceu:iv_arc_furnace" + } + ] + } + } + title: "Arc Furnace" + type: "item" + }] + title: "Getting Rid of Those Old Machines" + x: 7.875d + y: 5.625d + } ] subtitle: ["Improve your infrastructure and parallelise your setups"] title: "&5EV&r - Extreme Voltage" diff --git a/config/ftbquests/quests/chapters/gtceu.snbt b/overrides/config/ftbquests/quests/chapters/gtceu.snbt similarity index 100% rename from config/ftbquests/quests/chapters/gtceu.snbt rename to overrides/config/ftbquests/quests/chapters/gtceu.snbt diff --git a/config/ftbquests/quests/chapters/heating_coils.snbt b/overrides/config/ftbquests/quests/chapters/heating_coils.snbt similarity index 100% rename from config/ftbquests/quests/chapters/heating_coils.snbt rename to overrides/config/ftbquests/quests/chapters/heating_coils.snbt diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/overrides/config/ftbquests/quests/chapters/hv__high_voltage.snbt similarity index 92% rename from config/ftbquests/quests/chapters/hv__high_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 2970c29..8b60469 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -421,9 +421,9 @@ description: [ "The &3HV Chemical Reactor&r unlocks a ton of new recipes. Ah, who doesn't love the ever-growing demand on more advanced Chemistry?" "" - "&9Note:&r A lot of content is unlocked by reaching &6HV&r. However, not every processing line or item is crucial right now. It'd make &6HV&r too dense to include all of them here." + "&9Note:&r We've actually unlocked a ton of new content by reaching &6HV&r. However, not every processing line or item is crucial right now. It'd make the &6HV&r chapter far too dense if we included everything!" "" - "Go check out the &5EV&r Chapter if you want to push yourself." + "You could still check out the &5EV&r Chapter if you want to push yourself." ] icon: "gtceu:hv_chemical_reactor" id: "390E59F05132FCB8" @@ -441,17 +441,15 @@ { dependencies: ["0EFEE489906256AA"] description: [ - "Titanium requires a slightly more involved process than the previous materials to process. First you need &aRutile&r, obtained from &aBauxite&r." + "Titanium requires a slightly more &binvolved&r process than the previous materials to process. To get started, you'll need &aRutile&r, which can be obtained by processing &aBauxite&r." "" - "Rutile, a form of Titanium Dioxide, cannot be electrolyzed directly - it has to be obtained from other Ores." - "" - "The next steps are described in the next Quest. No need to rush things." + "Once you've gotten enough &5Rutile&r, your journey to &6Titanium&r continues in the next quest. There's no need to rush things." "{@pagebreak}" - "Bauxite is also an &6excellent source of Aluminium&r." + "You may have already noticed that Bauxite is also an &6excellent source of Aluminium&r." "" - "Going to &dThe End&r will give you access to a better Bauxite vein, as well as &9Ilmenite&r, an even better source of Rutile." + "Visiting &dThe End&r allows you to access a richer Bauxite vein, as well as &9Ilmenite&r - an even better source of Rutile." "" - "&9Tip:&r Ore processing for &aBauxite&r is ridiculously good! Doing the &3Thermal Centrifuge&r step will easily &6triple&r your &aRutile&r yield." + "&9Tip:&r Ore processing for &aBauxite&r is ridiculously good! Including the &3Thermal Centrifuge&r step easily &6triples&r your &aRutile&r yield." ] icon: "gtceu:rutile_dust" id: "59DFC4DA7D29C315" @@ -483,11 +481,11 @@ "1C55AE6AD5BDE304" ] description: [ - "To get your grubby hands on some Titanium, &aRutile&r must first be reduced to &aTitanium Tetrachloride&r in an &3HV Chemical Reactor&r, and then reduced again in the &3EBF&r with &dMagnesium&r to finally arrive at Titanium." + "To get your grubby hands on some Titanium, &aRutile&r must first be reduced to &aTitanium Tetrachloride&r in an &3HV Chemical Reactor&r, then reduced again in an &3EBF&r with &dMagnesium&r to finally arrive at Titanium." "" - "The &dCarbon&r, &dChlorine&r, &dOxygen&r, and &dMagnesium&r used in the process can be &6perfectly recovered&r from the byproduct &dCarbon Monoxide&r and &dMagnesium Chloride&r with no loss. Set up a system to recover them and you can process an indefinite amount of Rutile in a closed loop!" + "The &dCarbon&r, &dChlorine&r, &dOxygen&r, and &dMagnesium&r used in the process can be &6perfectly recovered&r from the byproduct &dCarbon Monoxide&r and &dMagnesium Chloride&r with no loss. If you set up a system to recover them, &athe only material&r that you'll need to provide for Titanium is &dRutile&r!" "{@pagebreak}" - "&aTitanium Tetrachloride&r also acts as a catalyst in the production of plastics. A small amount of &aTiClâ‚„ &rin the polymerisation process increases the polymer yield to &6133%&r&r. This is totally and completely optional." + "&aTitanium Tetrachloride&r also acts as a catalyst in the production of plastics. A touch of &aTiClâ‚„&r in the polymerisation process can increase the polymer yield to &6133%&r&r. Naturally, this is completely optional." ] icon: "gtceu:titanium_tetrachloride_bucket" id: "727075AAF9F91FAE" @@ -557,13 +555,13 @@ "727075AAF9F91FAE" ] description: [ - "&aTitanium&r has the highest corrosion resistance and strength-to-density ratio of any metallic element, so it's only natural that it's the main material for &5EV&r machines." + "&aTitanium&r has the highest corrosion resistance and strength-to-density ratio of any metallic element, so it's only natural that we'll be using it as the main material in our &5EV&r machinery." "" - "Be sure your closed loop for Rutile is ready, and prepare to run a dedicated &3EBF&r for hours." + "Confirm that your closed loop for &aRutile&r is up to standard, and prepare to run a dedicated &3EBF&r for hours." "" - "&5EV&r marks the end for single block generators! You'll need to run several &3HV Generators&r to keep up - and later, upgrades to Multiblock Generators will be required." + "A quick aside - now we're at &5EV&r, single block generators are about to fall out of style! You'll need to run several &3HV Generators&r to keep up - later, upgrades to Multiblock Generators will be required." "" - "While Multiblock generators are much more expensive, they have the ability to be much more energy efficient!" + "Whilst Multiblock generators are much more expensive, you'll find them to be much more energy efficient!" ] icon: "gtceu:titanium_ingot" id: "7FA0ACB7F161F378" @@ -792,15 +790,15 @@ { dependencies: ["41D32C5178760F47"] description: [ - "This prospector has a &6higher range&r than the &7LV&r one." + "This prospector boasts a &6higher range&r than its &7LV&r counterpart." "" - "Shift right-clicking on it will change the mod to &6Fluid Prospection&r. This will tell you the base &dyield&r of Fluid veins, along with how full they are." + "Sneak right-clicking with the Prospector in your hand will change its mode to &6Fluid Prospection&r. This will instead display the base &dyield&r of Fluid veins, along with how full they are." "" - "&9Reminder:&r The yield of &3Fluid Drilling Rigs&r is proportional to the fullness of the vein. When low enough, it defaults to yield defined in the config file." + "&9Reminder:&r The yield of a &3Fluid Drilling Rig&r is directly proportional to the \"fullness\" of the vein. When low enough, the output will default to a yield that can be defined in the CEu config." "{@pagebreak}" - "&9Tip:&r When the fullness drops below 30% (rough estimation), you should consider moving to another vein for the sake of power-to-yield efficiency. Aiming for the &3Advanced Fluid Drilling Rig&r in &5EV&r will be a nice goal, as not only it boosts the output significantly, but it also reduces the drain rate." + "&9Tip:&r When the fullness drops below 30% (alright, rough estimate), you should consider moving to another vein for the sake of power-to-yield efficiency. Aiming for the &3Advanced Fluid Drilling Rig&r in &5EV&r may interest you, as not only does it significantly boost the output, but it also reduces the rate at which it drains the vein!" "" - "&cCaution:&r Due to a bug, the prospector is offset by one chunk, so avoid placing your rig in the corners of the 8x8 chunk area, or you may end up pumping from another vein!" + "&cCaution:&r Due to a bug, the Prospector display may be offset by one chunk, so avoid placing your Rig in the corners of a fluid vein. or you may end up pumping the wrong fluid!" ] icon: "gtceu:prospector.hv" id: "2124BF15006733D5" @@ -890,7 +888,7 @@ description: [ "Making &aNitrobenzene&r will boost the energy efficiency of &aBenzene&r roughly &6fourfold&r. You love to see it." "" - "The catch here is that it takes &dDistilled Water&r and consumes a bit of &dSulfur&r every step." + "The catch here is that it takes &dDistilled Water&r, and consumes a bit of &dSulfur&r with every step." ] icon: { Count: 1b @@ -1285,13 +1283,13 @@ "&aAmmonia&r is &doptional&r in &6HV&r." "" "You may use it in the production of:" - "&9-&r Nitric Acid, although unrecommended." + "&9-&r Nitric Acid, although we don't recommend this." "&9-&r Rocket Fuel, required for Nether Stars in &1IV&r." "&9-&r Polybenzimidazole (now THAT'S a tongue twister!) in &1IV&r." "" - "The \"least painful\" recipe should be the one in the &3HV Chemical Reactor&r. Make sure your &aHydrogen&r production (mostly from &aWater electrolysis&r) is keeping up." + "The \"least painful\" recipe should be the one in the &3HV Chemical Reactor&r. Make sure your &aHydrogen&r production (mostly from &aWater electrolysis&r) is enough to support the demand." "" - "You can also obtain &aAmmonia&r as a waste product from &dPlatinum Group Sludge&r processing." + "You could also obtain &aAmmonia&r as a waste product from &dPlatinum Group Sludge&r processing." ] icon: "gtceu:ammonia_bucket" id: "4343746E706264E6" diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/overrides/config/ftbquests/quests/chapters/iv__insane_voltage.snbt similarity index 94% rename from config/ftbquests/quests/chapters/iv__insane_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/iv__insane_voltage.snbt index 02e64fe..0ab4278 100644 --- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/iv__insane_voltage.snbt @@ -50,7 +50,7 @@ "&9-&r &aNeodymium&r normally makes the strongest magnets, but gameplay balance... y'know." "&9-&r &aCadmium&r is not particularly useful." "{@pagebreak}" - "&l&3Lore:&r&o Rare Earth Elements (REE) contain a lot more metals than these, but we are struggling as is to give them use." + "&l&3Lore:&r&o Rare Earth Elements (REE) contain a lot more metals than these, but we're struggling as is to give them use." ] id: "300348B1238BCB9A" size: 0.75d @@ -77,7 +77,7 @@ "" "At this point, you may go back to using only one &3Electric Blast Furnace&r for your entire base, powering with the highest available Voltage you have." "" - "&6Hot Metals&r will start taking longer to cool down, as the &3Vacuum Freezer&r doesn't get perfect overclocks. For that you will probably want a dual (or quad) &3Vacuum Freezer&r." + "&6Hot Metals&r will start taking longer to cool down, as the &3Vacuum Freezer&r doesn't get perfect overclocks. For that, you probably want a dual (or quad) &3Vacuum Freezer&r." ] icon: "gtceu:hssg_coil_block" id: "7A1E3C3A2D699C5B" @@ -99,7 +99,7 @@ "" "If you previously made &dUltimet&r for whatever reason, you've already acquired &aMolybdenum&r. Otherwise, it can be found in a Nether vein." "" - "We hope you have a lot of &9Tungstensteel&r, because you're still gonna need more! It is used for the creation of &aHSS&r alloys - presently &aHSS-G&r." + "We hope you have a lot of &9Tungstensteel&r, because you're still gonna need more! It's used for the creation of &aHSS&r alloys - in this case, &aHSS-G&r." ] hide_dependency_lines: true id: "1776FA1F3255731E" @@ -184,8 +184,6 @@ "You should have all the tools available to produce &aPolybenzimidazole&r on your own!" "" "&aPBI&r only becomes mandatory to progress from &dLuV&r to &cZPM&r, but tackling it earlier will unlock the &6Advanced SMDs&r." - "" - "The Quest can be completed with &eany&r form of PBI. You'll probably want Bars for automation purposes." ] icon: "gtceu:polybenzimidazole_plate" id: "7CFC112B8F460549" @@ -196,11 +194,13 @@ amount: 1000L fluid: "gtceu:polybenzimidazole" id: "5971118ED25AC71A" + optional_task: true type: "fluid" } { id: "7C5D37940A0C8409" item: "gtceu:polybenzimidazole_ingot" + optional_task: true type: "item" } { @@ -221,7 +221,7 @@ description: [ "Better &aSMDs&r to make far more complex Circuits at a much cheaper price." "" - "You will require Alloys that you have not made yet, most of which will be common in &dLuV&r and onwards." + "These'll require Alloys that you have not made yet, most of which will be common in &dLuV&r and onwards." "" "&aAdvanced SMDs&r are required for the &dCrystal&r Circuit line." ] @@ -417,7 +417,7 @@ { dependencies: ["30A6EDDF25A5E5F8"] description: [ - "&1IV&r Components - fortunately for you - are not a big step up in terms of complexity." + "&1IV&r Components - fortunately for you - aren't a massive step up in terms of complexity." "" "However, the amount of &dTungsten&r required in crafting these is huge." "" @@ -427,6 +427,43 @@ id: "01AB252C72B565FE" shape: "rsquare" size: 0.66d + tasks: [ + { + id: "382B9759383E1AC3" + item: "gtceu:iv_electric_motor" + type: "item" + } + { + id: "0C74DFC662ECC366" + item: "gtceu:iv_electric_pump" + type: "item" + } + { + id: "519AC26F40AFFB88" + item: "gtceu:iv_conveyor_module" + type: "item" + } + { + id: "36CA1AAFADE476FF" + item: "gtceu:iv_electric_piston" + type: "item" + } + { + id: "27DB5DDEF05DDC0D" + item: "gtceu:iv_robot_arm" + type: "item" + } + { + id: "165F27AC399EC0FD" + item: "gtceu:iv_emitter" + type: "item" + } + { + id: "6AD8B7D88D9E10F5" + item: "gtceu:iv_sensor" + type: "item" + } + ] title: "There is no limit to \"Fun\"" x: 0.375d y: 6.0d @@ -528,7 +565,7 @@ "{@pagebreak}" "&l&3Lore:&r&o In GregTech 5, the Data Orb was used in the Matter Replicator to store the \"data\" of the material you wanted to replicate. There is no replication here - the Orb is now a mere crafting component." "" - "Additionally, GregTech 5's PA and other Multiblocks acted as a Cleanroom. There is no such thing here!" + "&oAdditionally, GregTech 5's PA and other Multiblocks acted as a Cleanroom. There's no such thing here!" ] id: "2DAC91AF2EBB68E2" size: 0.75d @@ -549,7 +586,7 @@ "69E384F389B0D07B" ] description: [ - "250,000,000 EU in a Battery? That's 25 minutes of Power when drained constantly. That's more than your average iPhone." + "&o&7\"250,000,000 EU in a Battery? That's 25 minutes of Power when drained constantly.\"" "" "The &aLapotronic Energy Orb&r should be the beginning of the end of your energy storage struggles." "" @@ -570,6 +607,7 @@ { id: "529358AADE55D801" item: "gtceu:iv_lapotronic_battery" + optional_task: true type: "item" } ] @@ -611,6 +649,7 @@ { id: "71D5FE3076C1F56C" item: "gtceu:nether_star_dust" + optional_task: true type: "item" } { @@ -622,7 +661,7 @@ value: "forge:gems/nether_star" } } - title: "Any #forge:gems/nether_star" + title: "Nether Star" type: "item" } ] @@ -673,9 +712,9 @@ "528CE69DA4358B2E" ] description: [ - "This part of the chain starts by obtaining some &aRarest Metal Residue&r." + "This part of the chain starts by obtaining some &aRarest Metal Mixture&r." "" - "You will need at least an &1IV&r &3Large Chemical Reactor&r, but the average power draw isn't too bad." + "You'll need at least an &1IV&r &3Large Chemical Reactor&r, but the average power draw isn't too bad." "" "&dChlorine&r is fully looped, and &dHydrogen&r is slightly negative (&ounless you put Acidic Osmium Solution in the Distillation Tower and electrolyze the water back... on second thoughts, don't do that&r)." "" @@ -998,18 +1037,27 @@ id: "48DEABA155605D23" shape: "rsquare" size: 0.66d - tasks: [ - { - id: "5A16A90F5B6FBDA9" - item: "gtceu:iv_energy_input_hatch" - type: "item" + tasks: [{ + id: "2EC4E901B2CD35FA" + item: { + Count: 1b + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:iv_energy_input_hatch" + } + { + Count: 1b + id: "gtceu:iv_energy_output_hatch" + } + ] + } } - { - id: "04CFDD86ADF6B918" - item: "gtceu:iv_energy_output_hatch" - type: "item" - } - ] + title: "IV Dynamo/Energy Hatch" + type: "item" + }] title: "Upgrading your EBF for the millionth time" x: 3.75d y: 3.75d diff --git a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt b/overrides/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt similarity index 98% rename from config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt index e7179a6..18ae5b1 100644 --- a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt @@ -436,6 +436,7 @@ { id: "48F555D3FC7EA449" item: "gtceu:trinium_sulfide_dust" + optional_task: true type: "item" } { @@ -695,14 +696,23 @@ "{@pagebreak}" "&l&3Lore:&r&o In older versions of GT, such as GTNH in the past or in GCYL, these orbs were ludicrously expensive! They required 8 orbs of the previous tier! Thankfully, those days are long past." ] + icon: "gtceu:lapotronic_energy_orb_cluster" id: "0D7C978F9CDF771B" size: 0.75d subtitle: "Even more power!" - tasks: [{ - id: "6D1376BF3CEA87A7" - item: "gtceu:lapotronic_energy_orb_cluster" - type: "item" - }] + tasks: [ + { + id: "6D1376BF3CEA87A7" + item: "gtceu:lapotronic_energy_orb_cluster" + type: "item" + } + { + id: "66D5D76676D27388" + item: "gtceu:luv_lapotronic_battery" + optional_task: true + type: "item" + } + ] title: "Ludicrous Batteries" x: 6.75d y: 4.5d diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/overrides/config/ftbquests/quests/chapters/lv__low_voltage.snbt similarity index 99% rename from config/ftbquests/quests/chapters/lv__low_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 3a00a3e..0eda46a 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -861,7 +861,7 @@ description: [ "&7LV&r will require you to craft a lot of different machines! Here's a friendly tip if you're struggling to set goals: pick an item in a later quest and go backwards from there." "" - "With that in mind... why don't we start with a &5Fusion Controller&r? Never mind, slightly too ambitious - let's check a closer goal instead. Ah, yes - the &3Electric Blast Furnace&r, the main \"end goal\" of &7LV&r - should be a good target." + "With that in mind... why don't we start with a &5Fusion Controller&r? Never mind, slightly too ambitious - let's check a closer goal instead. Ah, yes, the &3Electric Blast Furnace&r - the main \"end goal\" of &7LV&r - should be a good target." "" "The EBF is &aexpensive&r, which is why you should initially focus on machines to make components and materials cheaper. Our quests will try to will guide you in the right direction." "" diff --git a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt b/overrides/config/ftbquests/quests/chapters/multiblock_dilemma.snbt similarity index 100% rename from config/ftbquests/quests/chapters/multiblock_dilemma.snbt rename to overrides/config/ftbquests/quests/chapters/multiblock_dilemma.snbt diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/overrides/config/ftbquests/quests/chapters/mv__medium_voltage.snbt similarity index 99% rename from config/ftbquests/quests/chapters/mv__medium_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index c256efe..dbcc1aa 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -449,7 +449,7 @@ description: [ "All four output Dusts obtained from Clay electrolysis are immensely useful." "" - "You will need &a&ra total of &a416 Clay Dust&r for this quest. You may also want to look into other sources of similar materials, such as &aSodalite&r. Check JEI for some ideas." + "We'll ask you to give us a total of &a416 Clay Dust&r for this quest. You may also want to look into other sources of similar materials, such as &aSodalite&r. Check JEI for some ideas." "" "You should use the Sodium and/or Lithium to make some &6MV Batteries&r." "" diff --git a/config/ftbquests/quests/chapters/ore_generation.snbt b/overrides/config/ftbquests/quests/chapters/ore_generation.snbt similarity index 100% rename from config/ftbquests/quests/chapters/ore_generation.snbt rename to overrides/config/ftbquests/quests/chapters/ore_generation.snbt diff --git a/config/ftbquests/quests/chapters/progression.snbt b/overrides/config/ftbquests/quests/chapters/progression.snbt similarity index 100% rename from config/ftbquests/quests/chapters/progression.snbt rename to overrides/config/ftbquests/quests/chapters/progression.snbt diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/overrides/config/ftbquests/quests/chapters/steam_age.snbt similarity index 100% rename from config/ftbquests/quests/chapters/steam_age.snbt rename to overrides/config/ftbquests/quests/chapters/steam_age.snbt diff --git a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt b/overrides/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt similarity index 99% rename from config/ftbquests/quests/chapters/tips_and_tricks_2.snbt rename to overrides/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt index 7cabebe..023a8b2 100644 --- a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt +++ b/overrides/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt @@ -25,7 +25,7 @@ "" "High Pressure Steam Machines are the same speed as indicated by JEI, but with adjusted steam consumption. You will unlock them once you obtain Steel." "{@pagebreak}" - "Psst! If you're not in a Hardcore world, I invite you to stand on top of pipes transporting steam, or stand right in front of the vent as the machines are running recipes." + "Psst! If you're not in a Hardcore world, we invite you to stand on top of pipes transporting steam, or stand right in front of the vent as the machines are running recipes." ] icon: "gtceu:steam_machine_casing" id: "7FB2D6C9A3763A47" diff --git a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt b/overrides/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt similarity index 98% rename from config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt rename to overrides/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt index 6af2bdd..d9aeac4 100644 --- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt +++ b/overrides/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt @@ -107,14 +107,22 @@ "{@pagebreak}" "&l&3Lore:&r&o Imagine making 512 &1IV&f Orbs, or 64 &dLuV&f Orbs... or 8 &cZPM&f Orbs.... for just one of these! See the Lore for the LuV orb for details." ] + icon: "gtceu:energy_cluster" id: "3D9D27F29D9D12F6" size: 0.75d subtitle: "It holds way too much power!" - tasks: [{ - id: "3A3B82E7FEE173C3" - item: "gtceu:energy_cluster" - type: "item" - }] + tasks: [ + { + id: "3A3B82E7FEE173C3" + item: "gtceu:energy_cluster" + type: "item" + } + { + id: "57D8084A5AA960F8" + item: "gtceu:uv_lapotronic_battery" + type: "item" + } + ] title: "Ultimate Battery?" x: 7.875d y: 2.625d diff --git a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt b/overrides/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt similarity index 99% rename from config/ftbquests/quests/chapters/zpm__zero_point_module.snbt rename to overrides/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt index 1dbeb82..ec39543 100644 --- a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt +++ b/overrides/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt @@ -49,7 +49,6 @@ } { id: "7AD0E74B9CD9AFAE" - optional_task: true type: "checkmark" } ] @@ -352,11 +351,19 @@ id: "690A51204DF5D469" size: 0.75d subtitle: "A power singularity!" - tasks: [{ - id: "41813C4D68B991D7" - item: "gtceu:energy_module" - type: "item" - }] + tasks: [ + { + id: "41813C4D68B991D7" + item: "gtceu:energy_module" + type: "item" + } + { + id: "705422BF26C76199" + item: "gtceu:zpm_lapotronic_battery" + optional_task: true + type: "item" + } + ] title: "Mega Batteries" x: -1.5d y: 1.125d diff --git a/config/ftbquests/quests/data.snbt b/overrides/config/ftbquests/quests/data.snbt similarity index 100% rename from config/ftbquests/quests/data.snbt rename to overrides/config/ftbquests/quests/data.snbt diff --git a/config/ftbquests/quests/reward_tables/bronze_age.snbt b/overrides/config/ftbquests/quests/reward_tables/bronze_age.snbt similarity index 100% rename from config/ftbquests/quests/reward_tables/bronze_age.snbt rename to overrides/config/ftbquests/quests/reward_tables/bronze_age.snbt diff --git a/overrides/config/ftbxmodcompat.snbt b/overrides/config/ftbxmodcompat.snbt new file mode 100644 index 0000000..89bc0f3 --- /dev/null +++ b/overrides/config/ftbxmodcompat.snbt @@ -0,0 +1,13 @@ +{ + # Select the permissions implementation to use + # DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "ftb_ranks", "luckperms" + permission_selector: "default" + + # Select the game stages implementation to use + # DEFAULT: use KubeJS, Game Stages, vanilla in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "vanilla", "kubejs", "gamestages" + stage_selector: "default" +} diff --git a/config/gtceu.yaml b/overrides/config/gtceu.yaml similarity index 100% rename from config/gtceu.yaml rename to overrides/config/gtceu.yaml diff --git a/config/hangglider-client.toml b/overrides/config/hangglider-client.toml similarity index 100% rename from config/hangglider-client.toml rename to overrides/config/hangglider-client.toml diff --git a/config/hangglider-server.toml b/overrides/config/hangglider-server.toml similarity index 100% rename from config/hangglider-server.toml rename to overrides/config/hangglider-server.toml diff --git a/config/inventoryessentials-common.toml b/overrides/config/inventoryessentials-common.toml similarity index 100% rename from config/inventoryessentials-common.toml rename to overrides/config/inventoryessentials-common.toml diff --git a/config/inventorysorter-client.toml b/overrides/config/inventorysorter-client.toml similarity index 100% rename from config/inventorysorter-client.toml rename to overrides/config/inventorysorter-client.toml diff --git a/config/jade/hide-blocks.json b/overrides/config/jade/hide-blocks.json similarity index 100% rename from config/jade/hide-blocks.json rename to overrides/config/jade/hide-blocks.json diff --git a/config/jade/hide-entities.json b/overrides/config/jade/hide-entities.json similarity index 100% rename from config/jade/hide-entities.json rename to overrides/config/jade/hide-entities.json diff --git a/config/jade/jade.json b/overrides/config/jade/jade.json similarity index 100% rename from config/jade/jade.json rename to overrides/config/jade/jade.json diff --git a/config/jade/plugins.json b/overrides/config/jade/plugins.json similarity index 100% rename from config/jade/plugins.json rename to overrides/config/jade/plugins.json diff --git a/config/jade/sort-order.json b/overrides/config/jade/sort-order.json similarity index 100% rename from config/jade/sort-order.json rename to overrides/config/jade/sort-order.json diff --git a/config/modelfix-client.toml b/overrides/config/modelfix-client.toml similarity index 100% rename from config/modelfix-client.toml rename to overrides/config/modelfix-client.toml diff --git a/config/modernfix-common.toml b/overrides/config/modernfix-common.toml similarity index 100% rename from config/modernfix-common.toml rename to overrides/config/modernfix-common.toml diff --git a/config/modernfix-mixins.properties b/overrides/config/modernfix-mixins.properties similarity index 98% rename from config/modernfix-mixins.properties rename to overrides/config/modernfix-mixins.properties index 1c6ca95..d293693 100644 --- a/config/modernfix-mixins.properties +++ b/overrides/config/modernfix-mixins.properties @@ -66,6 +66,7 @@ # mixin.perf.fast_registry_validation=true # (default) # mixin.perf.faster_item_rendering=false # (default) # mixin.perf.faster_texture_stitching=true # (default) +# mixin.perf.forge_registry_lambda=true # (default) # mixin.perf.kubejs=true # (default) # mixin.perf.model_optimizations=true # (default) # mixin.perf.mojang_registry_size=true # (default) diff --git a/config/patchouli-client.toml b/overrides/config/patchouli-client.toml similarity index 100% rename from config/patchouli-client.toml rename to overrides/config/patchouli-client.toml diff --git a/config/polymorph-integrations.toml b/overrides/config/polymorph-integrations.toml similarity index 100% rename from config/polymorph-integrations.toml rename to overrides/config/polymorph-integrations.toml diff --git a/config/shimmer-client.toml b/overrides/config/shimmer-client.toml similarity index 100% rename from config/shimmer-client.toml rename to overrides/config/shimmer-client.toml diff --git a/config/sidebar_buttons.json b/overrides/config/sidebar_buttons.json similarity index 100% rename from config/sidebar_buttons.json rename to overrides/config/sidebar_buttons.json diff --git a/config/simplemagnets-common.toml b/overrides/config/simplemagnets-common.toml similarity index 100% rename from config/simplemagnets-common.toml rename to overrides/config/simplemagnets-common.toml diff --git a/config/smoothboot.json b/overrides/config/smoothboot.json similarity index 100% rename from config/smoothboot.json rename to overrides/config/smoothboot.json diff --git a/config/storagedrawers-client.toml b/overrides/config/storagedrawers-client.toml similarity index 100% rename from config/storagedrawers-client.toml rename to overrides/config/storagedrawers-client.toml diff --git a/config/storagedrawers-common.toml b/overrides/config/storagedrawers-common.toml similarity index 100% rename from config/storagedrawers-common.toml rename to overrides/config/storagedrawers-common.toml diff --git a/config/toastcontrol-common.toml b/overrides/config/toastcontrol-common.toml similarity index 100% rename from config/toastcontrol-common.toml rename to overrides/config/toastcontrol-common.toml diff --git a/config/toolbelt-client.toml b/overrides/config/toolbelt-client.toml similarity index 100% rename from config/toolbelt-client.toml rename to overrides/config/toolbelt-client.toml diff --git a/config/toolbelt-common.toml b/overrides/config/toolbelt-common.toml similarity index 100% rename from config/toolbelt-common.toml rename to overrides/config/toolbelt-common.toml diff --git a/config/torchmaster.toml b/overrides/config/torchmaster.toml similarity index 100% rename from config/torchmaster.toml rename to overrides/config/torchmaster.toml diff --git a/overrides/config/xaerominimap-common.txt b/overrides/config/xaerominimap-common.txt new file mode 100644 index 0000000..b36023c --- /dev/null +++ b/overrides/config/xaerominimap-common.txt @@ -0,0 +1,4 @@ +allowCaveModeOnServer:true +allowNetherCaveModeOnServer:true +allowRadarOnServer:true +registerStatusEffects:true diff --git a/overrides/config/xaerominimap.txt b/overrides/config/xaerominimap.txt new file mode 100644 index 0000000..4cd08a1 --- /dev/null +++ b/overrides/config/xaerominimap.txt @@ -0,0 +1,133 @@ +#CONFIG ONLY OPTIONS +ignoreUpdate:369 +settingsButton:false +allowWrongWorldTeleportation:false +differentiateByServerAddress:true +debugEntityIcons:false +debugEntityVariantIds:false +radarHideInvisibleEntities:true +allowInternetAccess:true +#INGAME SETTINGS (DO NOT EDIT!) +updateNotification:true +minimap:true +caveMaps:2 +caveZoom:1 +showWaypoints:true +showIngameWaypoints:true +displayRedstone:true +deathpoints:true +oldDeathpoints:true +distance:1 +lockNorth:false +zoom:0 +minimapSize:0 +chunkGrid:-1 +slimeChunks:false +mapSafeMode:false +minimapOpacity:100.0 +waypointsIngameIconScale:0 +waypointsIngameDistanceScale:0 +waypointsIngameNameScale:0 +waypointsIngameCloseScale:1.0 +antiAliasing:true +blockColours:0 +lighting:true +dotsStyle:0 +dotNameScale:1.0 +compassOverEverything:true +showFlowers:true +keepWaypointNames:true +waypointsDistanceExp:0 +waypointsDistanceMin:0.0 +defaultWaypointTPCommandFormat:/tp @s {x} {y} {z} +defaultWaypointTPCommandRotationFormat:/tp @s {x} {y} {z} {yaw} ~ +arrowScale:1.5 +arrowColour:0 +smoothDots:true +worldMap:true +terrainDepth:true +terrainSlopes:2 +mainEntityAs:0 +blockTransparency:true +waypointOpacityIngame:80 +waypointOpacityMap:90 +hideWorldNames:1 +openSlimeSettings:true +alwaysShowDistance:false +crossDimensionalTp:true +biomeColorsVanillaMode:false +lookingAtAngle:10 +lookingAtAngleVertical:180 +centeredEnlarged:false +zoomOnEnlarged:0 +minimapTextAlign:2 +waypointsMutualEdit:true +compassLocation:1 +compassDirectionScale:0 +caveMapsDepth:30 +hideWaypointCoordinates:false +renderAllSets:false +playerArrowOpacity:100 +waypointsBottom:false +minimapShape:0 +lightOverlayType:0 +lightOverlayMaxLight:7 +lightOverlayMinLight:0 +lightOverlayColor:13 +uiScale:0 +bossHealthPushBox:1 +potionEffectPushBox:1 +minimapFrame:0 +minimapFrameColor:9 +compassColor:9 +northCompassColor:-1 +displayMultipleWaypointInfo:1 +entityRadar:true +adjustHeightForCarpetLikeBlocks:true +autoConvertWaypointDistanceToKmThreshold:10000 +waypointDistancePrecision:1 +mainDotSize:2 +partialYTeleportation:true +deleteReachedDeathpoints:true +hideMinimapUnderScreen:true +hideMinimapUnderF3:true +manualCaveModeStartAuto:true +manualCaveModeStart:-1 +chunkGridLineWidth:1 +temporaryWaypointsGlobal:true +keepUnlockedWhenEnlarged:false +enlargedMinimapAToggle:false +displayStainedGlass:true +waypointOnMapScale:0 +switchToAutoOnDeath:true +infoDisplayBackgroundOpacity:40 +caveModeToggleTimer:1000 +legibleCaveMaps:false +biomeBlending:true +displayTrackedPlayers:true +dimensionScaledMaxWaypointDistance:true +displayClaims:true +displayCurrentClaim:true +claimsFillOpacity:46 +claimsBorderOpacity:80 +infoDisplayOrder:coords:biome:real_time:time:overworld_coords:chunk_coords:angles:dimension:weather:light_level:highlights:light_overlay_indicator:manual_cave_mode_indicator:custom_sub_world +infoDisplay:coords:true:6:-1 +infoDisplay:biome:true:6:-1 +infoDisplay:real_time:1:14:-1 +infoDisplay:time:1:14:-1 +infoDisplay:overworld_coords:false:15:-1 +infoDisplay:chunk_coords:false:15:-1 +infoDisplay:angles:false:15:-1 +infoDisplay:dimension:false:15:-1 +infoDisplay:weather:false:15:-1 +infoDisplay:light_level:0:15:-1 +infoDisplay:highlights:true:15:-1 +infoDisplay:light_overlay_indicator:true:15:-1 +infoDisplay:manual_cave_mode_indicator:true:15:-1 +infoDisplay:custom_sub_world:true:15:-1 +interface:dummy:0:36:true:false:false:false +interface:dummy:0:10000:true:false:false:false +interface:dummy:0:0:false:false:true:false +interface:dummy:0:36:true:false:false:false +interface:gui.xaero_minimap:90:-64:false:false:true:false +#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints diff --git a/overrides/config/xaerominimap_entities.json b/overrides/config/xaerominimap_entities.json new file mode 100644 index 0000000..46474f8 --- /dev/null +++ b/overrides/config/xaerominimap_entities.json @@ -0,0 +1,191 @@ +{ + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:glow_item_frame", + "minecraft:item_frame" + ], + "name": "gui.xaero_entity_category_root", + "protection": true, + "settingOverrides": { + "displayHeight": 0.0, + "displayed": true, + "heightBasedFade": true, + "renderOrder": 0.0, + "color": 13.0, + "displayNameWhenIconFails": true, + "entityNumber": 1000.0, + "alwaysDisplayNametags": false, + "dotSize": 2.0, + "startFadingAt": 0.0, + "renderOverMinimapFrame": 1.0, + "icons": 1.0, + "heightLimit": 20.0, + "names": 0.0, + "iconScale": 1.0 + }, + "subCategories": [ + { + "hardInclude": "living", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:armor_stand" + ], + "name": "gui.xaero_entity_category_living", + "protection": true, + "settingOverrides": { + "renderOrder": 2.0, + "color": 14.0 + }, + "subCategories": [ + { + "hardInclude": "players", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_players", + "protection": true, + "settingOverrides": { + "renderOrder": 6.0, + "heightLimit": 2050.0, + "color": 15.0 + }, + "subCategories": [ + { + "hardInclude": "nothing", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friend", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "tracked", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_tracked", + "protection": true, + "settingOverrides": { + "icons": 2.0 + }, + "subCategories": [] + }, + { + "hardInclude": "same-team", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_same_team", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_teams", + "protection": true, + "settingOverrides": { + "renderOrder": 7.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "hostile", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile", + "protection": true, + "settingOverrides": { + "renderOrder": 3.0 + }, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 5.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly", + "protection": true, + "settingOverrides": {}, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 4.0 + }, + "subCategories": [] + } + ] + } + ] + }, + { + "hardInclude": "items", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_items", + "protection": true, + "settingOverrides": { + "renderOrder": 1.0, + "color": 12.0 + }, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_entities", + "protection": true, + "settingOverrides": { + "color": 5.0 + }, + "subCategories": [] + } + ] +} \ No newline at end of file diff --git a/overrides/config/xaeropatreon.txt b/overrides/config/xaeropatreon.txt new file mode 100644 index 0000000..e69de29 diff --git a/overrides/config/xaeroworldmap-common.txt b/overrides/config/xaeroworldmap-common.txt new file mode 100644 index 0000000..c4becb0 --- /dev/null +++ b/overrides/config/xaeroworldmap-common.txt @@ -0,0 +1,3 @@ +allowCaveModeOnServer:true +allowNetherCaveModeOnServer:true +registerStatusEffects:true diff --git a/overrides/config/xaeroworldmap.txt b/overrides/config/xaeroworldmap.txt new file mode 100644 index 0000000..1592cdf --- /dev/null +++ b/overrides/config/xaeroworldmap.txt @@ -0,0 +1,55 @@ +ignoreUpdate:170 +updateNotification:true +allowInternetAccess:true +differentiateByServerAddress:true +caveMapsAllowed:true +debug:false +lighting:true +colours:0 +loadChunks:true +updateChunks:true +terrainSlopes:2 +terrainDepth:true +footsteps:true +flowers:true +coordinates:true +hoveredBiome:true +biomeColorsVanillaMode:false +waypoints:true +renderArrow:true +displayZoom:true +worldmapWaypointsScale:1.0 +openMapAnimation:true +reloadVersion:0 +reloadEverything:false +zoomButtons:true +waypointBackgrounds:true +detectAmbiguousY:true +showDisabledWaypoints:false +closeWaypointsWhenHopping:true +adjustHeightForCarpetLikeBlocks:true +onlyCurrentMapWaypoints:false +minZoomForLocalWaypoints:0.0 +arrowColour:-2 +minimapRadar:true +renderWaypoints:true +partialYTeleportation:true +displayStainedGlass:true +caveModeDepth:30 +caveModeStart:2147483647 +autoCaveMode:-1 +legibleCaveMaps:false +displayCaveModeStart:true +caveModeToggleTimer:1000 +defaultCaveModeType:1 +biomeBlending:true +trackedPlayers:true +multipleImagesExport:false +nightExport:false +highlightsExport:false +exportScaleDownSquare:20 +mapWritingDistance:-1 +displayClaims:true +claimsFillOpacity:46 +claimsBorderOpacity:80 +globalVersion:1 diff --git a/kubejs/assets/ftbquests/textures/items/recipestudy/clay_overview.png b/overrides/kubejs/assets/ftbquests/textures/items/recipestudy/clay_overview.png similarity index 100% rename from kubejs/assets/ftbquests/textures/items/recipestudy/clay_overview.png rename to overrides/kubejs/assets/ftbquests/textures/items/recipestudy/clay_overview.png diff --git a/kubejs/assets/gtceu/lang/en_us.json b/overrides/kubejs/assets/gtceu/lang/en_us.json similarity index 100% rename from kubejs/assets/gtceu/lang/en_us.json rename to overrides/kubejs/assets/gtceu/lang/en_us.json diff --git a/kubejs/assets/kubejs/textures/item/greg_icon.png b/overrides/kubejs/assets/kubejs/textures/item/greg_icon.png similarity index 100% rename from kubejs/assets/kubejs/textures/item/greg_icon.png rename to overrides/kubejs/assets/kubejs/textures/item/greg_icon.png diff --git a/kubejs/client_scripts/example.js b/overrides/kubejs/client_scripts/example.js similarity index 100% rename from kubejs/client_scripts/example.js rename to overrides/kubejs/client_scripts/example.js diff --git a/kubejs/client_scripts/jei_hidden.js b/overrides/kubejs/client_scripts/jei_hidden.js similarity index 100% rename from kubejs/client_scripts/jei_hidden.js rename to overrides/kubejs/client_scripts/jei_hidden.js diff --git a/kubejs/config/client.properties b/overrides/kubejs/config/client.properties similarity index 100% rename from kubejs/config/client.properties rename to overrides/kubejs/config/client.properties diff --git a/kubejs/config/common.properties b/overrides/kubejs/config/common.properties similarity index 100% rename from kubejs/config/common.properties rename to overrides/kubejs/config/common.properties diff --git a/kubejs/config/packicon.png b/overrides/kubejs/config/packicon.png similarity index 100% rename from kubejs/config/packicon.png rename to overrides/kubejs/config/packicon.png diff --git a/kubejs/server_scripts/appliedenergistics2/ae2.js b/overrides/kubejs/server_scripts/appliedenergistics2/ae2.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/ae2.js rename to overrides/kubejs/server_scripts/appliedenergistics2/ae2.js diff --git a/kubejs/server_scripts/appliedenergistics2/cables.js b/overrides/kubejs/server_scripts/appliedenergistics2/cables.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/cables.js rename to overrides/kubejs/server_scripts/appliedenergistics2/cables.js diff --git a/kubejs/server_scripts/appliedenergistics2/cards.js b/overrides/kubejs/server_scripts/appliedenergistics2/cards.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/cards.js rename to overrides/kubejs/server_scripts/appliedenergistics2/cards.js diff --git a/kubejs/server_scripts/appliedenergistics2/cells.js b/overrides/kubejs/server_scripts/appliedenergistics2/cells.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/cells.js rename to overrides/kubejs/server_scripts/appliedenergistics2/cells.js diff --git a/kubejs/server_scripts/appliedenergistics2/certus_quartz.js b/overrides/kubejs/server_scripts/appliedenergistics2/certus_quartz.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/certus_quartz.js rename to overrides/kubejs/server_scripts/appliedenergistics2/certus_quartz.js diff --git a/kubejs/server_scripts/appliedenergistics2/circuitry.js b/overrides/kubejs/server_scripts/appliedenergistics2/circuitry.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/circuitry.js rename to overrides/kubejs/server_scripts/appliedenergistics2/circuitry.js diff --git a/kubejs/server_scripts/appliedenergistics2/crafting_storage.js b/overrides/kubejs/server_scripts/appliedenergistics2/crafting_storage.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/crafting_storage.js rename to overrides/kubejs/server_scripts/appliedenergistics2/crafting_storage.js diff --git a/kubejs/server_scripts/appliedenergistics2/extendedae2.js b/overrides/kubejs/server_scripts/appliedenergistics2/extendedae2.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/extendedae2.js rename to overrides/kubejs/server_scripts/appliedenergistics2/extendedae2.js diff --git a/kubejs/server_scripts/appliedenergistics2/inter_providers.js b/overrides/kubejs/server_scripts/appliedenergistics2/inter_providers.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/inter_providers.js rename to overrides/kubejs/server_scripts/appliedenergistics2/inter_providers.js diff --git a/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js b/overrides/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js rename to overrides/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js diff --git a/kubejs/server_scripts/appliedenergistics2/patterns.js b/overrides/kubejs/server_scripts/appliedenergistics2/patterns.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/patterns.js rename to overrides/kubejs/server_scripts/appliedenergistics2/patterns.js diff --git a/kubejs/server_scripts/appliedenergistics2/portable_cells.js b/overrides/kubejs/server_scripts/appliedenergistics2/portable_cells.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/portable_cells.js rename to overrides/kubejs/server_scripts/appliedenergistics2/portable_cells.js diff --git a/kubejs/server_scripts/appliedenergistics2/pressing.js b/overrides/kubejs/server_scripts/appliedenergistics2/pressing.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/pressing.js rename to overrides/kubejs/server_scripts/appliedenergistics2/pressing.js diff --git a/kubejs/server_scripts/appliedenergistics2/removals.js b/overrides/kubejs/server_scripts/appliedenergistics2/removals.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/removals.js rename to overrides/kubejs/server_scripts/appliedenergistics2/removals.js diff --git a/kubejs/server_scripts/appliedenergistics2/storage_parts.js b/overrides/kubejs/server_scripts/appliedenergistics2/storage_parts.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/storage_parts.js rename to overrides/kubejs/server_scripts/appliedenergistics2/storage_parts.js diff --git a/kubejs/server_scripts/appliedenergistics2/terminals.js b/overrides/kubejs/server_scripts/appliedenergistics2/terminals.js similarity index 100% rename from kubejs/server_scripts/appliedenergistics2/terminals.js rename to overrides/kubejs/server_scripts/appliedenergistics2/terminals.js diff --git a/kubejs/server_scripts/building_gadgets/gadgets.js b/overrides/kubejs/server_scripts/building_gadgets/gadgets.js similarity index 100% rename from kubejs/server_scripts/building_gadgets/gadgets.js rename to overrides/kubejs/server_scripts/building_gadgets/gadgets.js diff --git a/kubejs/server_scripts/crafting_station/recipes.js b/overrides/kubejs/server_scripts/crafting_station/recipes.js similarity index 100% rename from kubejs/server_scripts/crafting_station/recipes.js rename to overrides/kubejs/server_scripts/crafting_station/recipes.js diff --git a/kubejs/server_scripts/elden_ring.js b/overrides/kubejs/server_scripts/elden_ring.js similarity index 100% rename from kubejs/server_scripts/elden_ring.js rename to overrides/kubejs/server_scripts/elden_ring.js diff --git a/kubejs/server_scripts/gregtech/components.js b/overrides/kubejs/server_scripts/gregtech/components.js similarity index 100% rename from kubejs/server_scripts/gregtech/components.js rename to overrides/kubejs/server_scripts/gregtech/components.js diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/overrides/kubejs/server_scripts/gregtech/greenhouse.js similarity index 100% rename from kubejs/server_scripts/gregtech/greenhouse.js rename to overrides/kubejs/server_scripts/gregtech/greenhouse.js diff --git a/kubejs/server_scripts/gregtech/inscriber.js b/overrides/kubejs/server_scripts/gregtech/inscriber.js similarity index 100% rename from kubejs/server_scripts/gregtech/inscriber.js rename to overrides/kubejs/server_scripts/gregtech/inscriber.js diff --git a/kubejs/server_scripts/gregtech/tools.js b/overrides/kubejs/server_scripts/gregtech/tools.js similarity index 100% rename from kubejs/server_scripts/gregtech/tools.js rename to overrides/kubejs/server_scripts/gregtech/tools.js diff --git a/kubejs/server_scripts/gregtech/wood_unification.js b/overrides/kubejs/server_scripts/gregtech/wood_unification.js similarity index 100% rename from kubejs/server_scripts/gregtech/wood_unification.js rename to overrides/kubejs/server_scripts/gregtech/wood_unification.js diff --git a/kubejs/server_scripts/open_blocks/elevator.js b/overrides/kubejs/server_scripts/open_blocks/elevator.js similarity index 100% rename from kubejs/server_scripts/open_blocks/elevator.js rename to overrides/kubejs/server_scripts/open_blocks/elevator.js diff --git a/kubejs/server_scripts/open_blocks/hang_glider.js b/overrides/kubejs/server_scripts/open_blocks/hang_glider.js similarity index 100% rename from kubejs/server_scripts/open_blocks/hang_glider.js rename to overrides/kubejs/server_scripts/open_blocks/hang_glider.js diff --git a/kubejs/server_scripts/open_blocks/magnets.js b/overrides/kubejs/server_scripts/open_blocks/magnets.js similarity index 100% rename from kubejs/server_scripts/open_blocks/magnets.js rename to overrides/kubejs/server_scripts/open_blocks/magnets.js diff --git a/kubejs/server_scripts/removals.js b/overrides/kubejs/server_scripts/removals.js similarity index 100% rename from kubejs/server_scripts/removals.js rename to overrides/kubejs/server_scripts/removals.js diff --git a/kubejs/server_scripts/storage_drawers/drawers.js b/overrides/kubejs/server_scripts/storage_drawers/drawers.js similarity index 100% rename from kubejs/server_scripts/storage_drawers/drawers.js rename to overrides/kubejs/server_scripts/storage_drawers/drawers.js diff --git a/kubejs/server_scripts/storage_drawers/upgrades.js b/overrides/kubejs/server_scripts/storage_drawers/upgrades.js similarity index 100% rename from kubejs/server_scripts/storage_drawers/upgrades.js rename to overrides/kubejs/server_scripts/storage_drawers/upgrades.js diff --git a/kubejs/server_scripts/tags/ae2.js b/overrides/kubejs/server_scripts/tags/ae2.js similarity index 100% rename from kubejs/server_scripts/tags/ae2.js rename to overrides/kubejs/server_scripts/tags/ae2.js diff --git a/kubejs/server_scripts/tags/gregtech.js b/overrides/kubejs/server_scripts/tags/gregtech.js similarity index 100% rename from kubejs/server_scripts/tags/gregtech.js rename to overrides/kubejs/server_scripts/tags/gregtech.js diff --git a/kubejs/server_scripts/tags/items.js b/overrides/kubejs/server_scripts/tags/items.js similarity index 100% rename from kubejs/server_scripts/tags/items.js rename to overrides/kubejs/server_scripts/tags/items.js diff --git a/kubejs/server_scripts/tool_belt/recipes.js b/overrides/kubejs/server_scripts/tool_belt/recipes.js similarity index 100% rename from kubejs/server_scripts/tool_belt/recipes.js rename to overrides/kubejs/server_scripts/tool_belt/recipes.js diff --git a/kubejs/server_scripts/torchmaster.js b/overrides/kubejs/server_scripts/torchmaster.js similarity index 100% rename from kubejs/server_scripts/torchmaster.js rename to overrides/kubejs/server_scripts/torchmaster.js diff --git a/kubejs/server_scripts/vanilla/loot_drops.js b/overrides/kubejs/server_scripts/vanilla/loot_drops.js similarity index 100% rename from kubejs/server_scripts/vanilla/loot_drops.js rename to overrides/kubejs/server_scripts/vanilla/loot_drops.js diff --git a/kubejs/server_scripts/vanilla/mob_drops.js b/overrides/kubejs/server_scripts/vanilla/mob_drops.js similarity index 100% rename from kubejs/server_scripts/vanilla/mob_drops.js rename to overrides/kubejs/server_scripts/vanilla/mob_drops.js diff --git a/kubejs/startup_scripts/components/hsla-steel.js b/overrides/kubejs/startup_scripts/components/hsla-steel.js similarity index 100% rename from kubejs/startup_scripts/components/hsla-steel.js rename to overrides/kubejs/startup_scripts/components/hsla-steel.js diff --git a/kubejs/startup_scripts/icons.js b/overrides/kubejs/startup_scripts/icons.js similarity index 100% rename from kubejs/startup_scripts/icons.js rename to overrides/kubejs/startup_scripts/icons.js diff --git a/kubejs/startup_scripts/machinery/greenhouse.js b/overrides/kubejs/startup_scripts/machinery/greenhouse.js similarity index 100% rename from kubejs/startup_scripts/machinery/greenhouse.js rename to overrides/kubejs/startup_scripts/machinery/greenhouse.js diff --git a/kubejs/startup_scripts/material_testing/material.js b/overrides/kubejs/startup_scripts/material_testing/material.js similarity index 100% rename from kubejs/startup_scripts/material_testing/material.js rename to overrides/kubejs/startup_scripts/material_testing/material.js diff --git a/kubejs/startup_scripts/recipes/greenhouse.js b/overrides/kubejs/startup_scripts/recipes/greenhouse.js similarity index 100% rename from kubejs/startup_scripts/recipes/greenhouse.js rename to overrides/kubejs/startup_scripts/recipes/greenhouse.js