diff --git a/Jenkinsfile b/Jenkinsfile index 3089c86..9497624 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,8 +27,8 @@ pipeline { branch "**/master" } steps { - publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'curseforge', reportFiles: 'modlist.html', reportName: 'Mod List', reportTitles: '']) - zip archive: true, dir: 'curseforge', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM.zip' + publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'client', reportFiles: 'modlist.html', reportName: 'Mod List', reportTitles: '']) + zip archive: true, dir: 'client', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM.zip' zip archive: true, dir: 'server', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM_server.zip' } } diff --git a/curseforge/manifest.json b/client/manifest.json similarity index 86% rename from curseforge/manifest.json rename to client/manifest.json index 30b63d1..29a2aa4 100644 --- a/curseforge/manifest.json +++ b/client/manifest.json @@ -11,7 +11,7 @@ "manifestType": "minecraftModpack", "manifestVersion": 1, "name": "RSEMCM", - "version": "0.2.1", + "version": "0.2.2", "author": "", "files": [ { @@ -56,7 +56,7 @@ }, { "projectID": 618298, - "fileID": 3793531, + "fileID": 3809348, "required": true }, { @@ -66,12 +66,12 @@ }, { "projectID": 574300, - "fileID": 3797910, + "fileID": 3807443, "required": true }, { "projectID": 583228, - "fileID": 3753584, + "fileID": 3805271, "required": true }, { @@ -106,7 +106,7 @@ }, { "projectID": 268560, - "fileID": 3743835, + "fileID": 3810540, "required": true }, { @@ -114,6 +114,11 @@ "fileID": 3725501, "required": true }, + { + "projectID": 361026, + "fileID": 3809335, + "required": true + }, { "projectID": 551520, "fileID": 3750013, @@ -121,7 +126,7 @@ }, { "projectID": 268566, - "fileID": 3743837, + "fileID": 3810542, "required": true }, { @@ -136,7 +141,12 @@ }, { "projectID": 422301, - "fileID": 3796638, + "fileID": 3807524, + "required": true + }, + { + "projectID": 300331, + "fileID": 3741435, "required": true }, { @@ -254,6 +264,11 @@ "fileID": 3755665, "required": true }, + { + "projectID": 239197, + "fileID": 3809574, + "required": true + }, { "projectID": 563928, "fileID": 3801033, @@ -289,9 +304,14 @@ "fileID": 3575623, "required": true }, + { + "projectID": 313866, + "fileID": 3773562, + "required": true + }, { "projectID": 419699, - "fileID": 3801525, + "fileID": 3807924, "required": true }, { @@ -356,7 +376,7 @@ }, { "projectID": 377448, - "fileID": 3751153, + "fileID": 3807783, "required": true }, { @@ -391,7 +411,7 @@ }, { "projectID": 306770, - "fileID": 3729975, + "fileID": 3809917, "required": true }, { @@ -431,7 +451,7 @@ }, { "projectID": 531834, - "fileID": 3803388, + "fileID": 3806807, "required": true }, { @@ -446,7 +466,7 @@ }, { "projectID": 342466, - "fileID": 3753619, + "fileID": 3805799, "required": true }, { @@ -454,14 +474,9 @@ "fileID": 3697638, "required": true }, - { - "projectID": 316867, - "fileID": 3784685, - "required": true - }, { "projectID": 223852, - "fileID": 3693181, + "fileID": 3807626, "required": true }, { @@ -479,6 +494,11 @@ "fileID": 3785773, "required": true }, + { + "projectID": 548599, + "fileID": 3785792, + "required": true + }, { "projectID": 272335, "fileID": 3804158, @@ -509,6 +529,11 @@ "fileID": 3669114, "required": true }, + { + "projectID": 368718, + "fileID": 3735545, + "required": true + }, { "projectID": 581495, "fileID": 3770744, @@ -516,7 +541,7 @@ }, { "projectID": 342543, - "fileID": 3793418, + "fileID": 3808854, "required": true }, { diff --git a/curseforge/modlist.html b/client/modlist.html similarity index 93% rename from curseforge/modlist.html rename to client/modlist.html index 503afbb..d4c6d50 100644 --- a/curseforge/modlist.html +++ b/client/modlist.html @@ -19,11 +19,13 @@
  • FTB Library (Forge) (by FTB)
  • Mekanism (by bradyaidanc)
  • FTB Teams (Forge) (by FTB)
    • +
  • Occultism (by kli_kli)
  • Better Fps - Render Distance[Forge] (by someaddon)
  • Mekanism Generators (by bradyaidanc)
  • CoFH Core (by TeamCoFH)
  • Thermal Expansion (by TeamCoFH)
  • Sophisticated Backpacks (by P3pp3rF1y)
    • +
  • Simply Light (by Flanks255)
  • RFTools Control (by McJty)
  • Waystones (by BlayTheNinth)
  • Ding (by ohaiiChun)
    • @@ -47,6 +49,7 @@
  • Curios API (Forge) (by TheIllusiveC4)
  • Library Ferret - Forge (by jtl_elisa)
  • Immersive Engineering (by BluSunrize)
    • +
  • CraftTweaker (by Jaredlll08)
  • TerraBlender (Forge) (by TheAdubbz)
  • Productive Bees (by LobsterJonn)
  • Farmer's Delight (by vectorwing)
    • @@ -54,6 +57,7 @@
  • Quark (by Vazkii)
  • AutoRegLib (by Vazkii)
  • Quark Oddities (by Vazkii)
    • +
  • Engineer's Decor (by wilechaote)
  • Architectury API (Fabric/Forge) (by shedaniel)
  • Iron Chests: Restocked (by ThatGravyBoat)
  • McJtyLib (by McJty)
    • @@ -87,17 +91,18 @@
  • Runelic (by DarkhaxDev)
  • RFTools Utility (by McJty)
  • Decorative Blocks (by stohun)
    • -
  • Electrodynamics (by aurilisdev)
  • Storage Drawers (by Texelsaur)
  • Chisels & Bits - For Forge (by AlgorithmX2)
  • Awesome Dungeon - Forge (by jtl_elisa)
  • GeckoLib (by ThanosGecko)
    • +
  • Hexerei (by JoeFoxe)
  • Cucumber Library (by BlakeBr0)
  • Citadel (by sbom_xela)
  • Pipez (by henkelmax)
  • SuperMartijn642's Config Lib (by SuperMartijn642)
  • The Undergarden (by Quek04)
  • Feature NBT Deadlock Be Gone (by telepathicgrunt)
    • +
  • JEITweaker (by Jaredlll08)
  • Oculus (by Asek3)
  • Mahou Tsukai (by stepcros)
  • Tinkers Construct (by mDiyo)
    • diff --git a/client/overrides/config/Advancedperipherals/general.toml b/client/overrides/config/Advancedperipherals/general.toml new file mode 100644 index 0000000..36a9e71 --- /dev/null +++ b/client/overrides/config/Advancedperipherals/general.toml @@ -0,0 +1,13 @@ + +#Config to adjust general mod settings +[General] + #Enable the debug mode. You should only enable it, if a developer says it or something does not work. + enableDebugMode = false + +[Core] + #Enables initial cooldown on peripheral initialization + isInitialCooldownEnabled = true + #Determinates initial cooldown sensentive level, values lower then this value will not trigger initial cooldown + #Range: > 0 + initialCooldownSensetiveLevel = 6000 + diff --git a/client/overrides/config/Advancedperipherals/metaphysics.toml b/client/overrides/config/Advancedperipherals/metaphysics.toml new file mode 100644 index 0000000..0ccb6df --- /dev/null +++ b/client/overrides/config/Advancedperipherals/metaphysics.toml @@ -0,0 +1,32 @@ + +#Config for metaphysics +[Metaphysics] + #Defines energy to fuel rate + #Range: > 575 + energyToFuelRate = 575 + enableWeakAutomataCore = true + enableEndAutomataCore = true + enableHusbandryAutomataCore = true + #Defines max warp point stored in warp core. Mostly need to not allow NBT overflow error + #Range: > 1 + endAutomataCoreWarpPointLimit = 64 + #Chance that overpowered automata will break after rotation cycle + #Range: 0.0 ~ 1.0 + overpoweredAutomataBreakChance = 0.002 + #Range: 1 ~ 64 + tier1AutomataCoreInteractionRadius = 2 + #Range: 1 ~ 32 + tier1AutomataCoreMaxFuelConsumptionRate = 2 + #Range: 1 ~ 64 + tier2AutomataCoreInteractionRadius = 4 + #Range: 1 ~ 32 + tier2AutomataCoreMaxFuelConsumptionRate = 3 + #Range: 1 ~ 64 + overpoweredTier1AutomataCoreInteractionRadius = 4 + #Range: 1 ~ 32 + overpoweredTier1AutomataCoreMaxFuelConsumptionRate = 3 + #Range: 1 ~ 64 + overpoweredTier2AutomataCoreInteractionRadius = 6 + #Range: 1 ~ 32 + overpoweredTier2AutomataCoreMaxFuelConsumptionRate = 4 + diff --git a/curseforge/overrides/config/ironchests/defaults.lock b/client/overrides/config/Advancedperipherals/peripherals-1.toml.bak similarity index 100% rename from curseforge/overrides/config/ironchests/defaults.lock rename to client/overrides/config/Advancedperipherals/peripherals-1.toml.bak diff --git a/client/overrides/config/Advancedperipherals/peripherals.toml b/client/overrides/config/Advancedperipherals/peripherals.toml new file mode 100644 index 0000000..fc8572f --- /dev/null +++ b/client/overrides/config/Advancedperipherals/peripherals.toml @@ -0,0 +1,139 @@ + +#Peripherals config +[Peripherals] + + [Peripherals.Player_Detector] + #Enable the Player Detector or not. + enablePlayerDetector = true + #The max range of the player detector functions. If anyone use a higher range, the detector will use this max range + #Range: 0 ~ 100000000 + playerDetMaxRange = 100000000 + #Activates the "getPlayerPos" function of the Player Detector + enablePlayerPosFunction = true + #Adds more information to `getPlayerPos` of the Player Detector. Like rotation and dimension + morePlayerInformation = true + + [Peripherals.Energy_Detector] + #Enable the Energy Detector or not. + enableEnergyDetector = true + #Defines the maximum energy flow of the energy detector. + #Range: > 1 + energyDetectorMaxFlow = 2147483647 + + [Peripherals.NBT_Storage] + #Enable the nbt storage block or not + enableNBTStorage = true + #Defines max nbt string length that can be stored in nbt storage + #Range: > 0 + nbtStorageMaxSize = 1048576 + + [Peripherals.Chunky_Turtle] + #Enable the Chunky Turtle or not. + enableChunkyTurtle = true + #Time in seconds, while loaded chunk can be consider as valid without touch + #Range: > 60 + chunkLoadValidTime = 600 + + [Peripherals.Chat_Box] + #Enable the Chat Box or not. + enableChatBox = true + #Defines default chatbox prefix + defaultChatBoxPrefix = "AP" + + [Peripherals.ME_Bridge] + #Enable the Me Bridge or not. + enableMeBridge = true + #Power consumption per tick. + #Range: > 0 + mePowerConsumption = 10 + + [Peripherals.RS_Bridge] + #Enable the Rs Bridge or not. + enableRsBridge = true + #Power consumption per tick. + #Range: > 0 + rsPowerConsumption = 10 + + [Peripherals.Environment_Detector] + #Enable the Environment Detector or not. + enableEnvironmentDetector = true + + [Peripherals.AR_Controller] + #Enable the AR goggles or not. + enableARGoggles = true + + [Peripherals.Inventory_Manager] + #Enable the inventory manager or not. + enableInventoryManager = true + + [Peripherals.Redstone_Integrator] + #Enable the redstone integrator or not. + enableRedstoneIntegrator = true + + [Peripherals.Block_Reader] + #Enable the block reader or not. + enableBlockReader = true + + [Peripherals.Geo_Scanner] + #Enable the geo scanner or not. + enableGeoScanner = true + + [Peripherals.Colony_Integrator] + #Enable the colony integrator or not. + enableColonyIntegrator = true + + [Peripherals.Compass_Turtle] + #Enable the compass turtle or not. + enableCompassTurtle = true + + [Peripherals.Powered_Peripherals] + #Enable RF storage for peripherals, that could use it + enablePoweredPeripherals = false + #Defines max energy storage in any powered peripheral + #Range: > 1000000 + poweredPeripheralMaxEnergyStored = 100000000 + + [Peripherals.Operations] + #Range: > 1000 + digCooldown = 1000 + #Range: > 0 + digCost = 1 + #Range: > 1000 + useOnBlockCooldown = 5000 + #Range: > 0 + useOnBlockCost = 1 + #Range: > 1000 + suckCooldown = 1000 + #Range: > 0 + suckCost = 1 + #Range: > 1000 + useOnAnimalCooldown = 2500 + #Range: > 0 + useOnAnimalCost = 10 + #Range: > 1000 + captureAnimalCooldown = 50000 + #Range: > 0 + captureAnimalCost = 100 + #Range: > 1000 + warpCooldown = 1000 + #Range: > 0 + warpCost = 1 + #Range: > 1000 + scanBlocksCooldown = 2000 + #Range: 1 ~ 64 + scanBlocksMaxFreeRadius = 8 + #Range: 1 ~ 64 + scanBlocksMaxCostRadius = 16 + #Range: 0.1 ~ 1.7976931348623157E308 + scanBlocksExtraBlockCost = 0.17 + #Range: > 1000 + scanEntitiesCooldown = 2000 + #Range: 1 ~ 64 + scanEntitiesMaxFreeRadius = 8 + #Range: 1 ~ 64 + scanEntitiesMaxCostRadius = 16 + #Range: 0.1 ~ 1.7976931348623157E308 + scanEntitiesExtraBlockCost = 0.17 + #Range: > 1000 + chatMessageCooldown = 1000 + diff --git a/client/overrides/config/Advancedperipherals/world.toml b/client/overrides/config/Advancedperipherals/world.toml new file mode 100644 index 0000000..e24e993 --- /dev/null +++ b/client/overrides/config/Advancedperipherals/world.toml @@ -0,0 +1,11 @@ + +#Config to adjust world settings +[World] + #Enable the villager structures for the computer scientist. + enableVillagerStructures = true + #Gives the ap documentation to new players on a world. + givePlayerBookOnJoin = true + #The weight of the villager structures + #Range: 0 ~ 16000 + villagerStructureWeight = 10 + diff --git a/curseforge/overrides/config/Mekanism/client.toml b/client/overrides/config/Mekanism/client.toml similarity index 96% rename from curseforge/overrides/config/Mekanism/client.toml rename to client/overrides/config/Mekanism/client.toml index a018e25..cf4bfc4 100644 --- a/curseforge/overrides/config/Mekanism/client.toml +++ b/client/overrides/config/Mekanism/client.toml @@ -95,7 +95,7 @@ y = 2147483647 [client.gui.window.sideConfig] - x = 10 + x = 9 y = 15 [client.gui.window.transporterConfig] @@ -104,7 +104,7 @@ [client.gui.window.upgrade] x = 10 - y = 15 + y = -102 #QIO Config [client.qio] diff --git a/curseforge/overrides/config/Mekanism/gear.toml b/client/overrides/config/Mekanism/gear.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/gear.toml rename to client/overrides/config/Mekanism/gear.toml diff --git a/curseforge/overrides/config/Mekanism/general.toml b/client/overrides/config/Mekanism/general.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/general.toml rename to client/overrides/config/Mekanism/general.toml diff --git a/curseforge/overrides/config/Mekanism/machine-storage.toml b/client/overrides/config/Mekanism/machine-storage.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/machine-storage.toml rename to client/overrides/config/Mekanism/machine-storage.toml diff --git a/curseforge/overrides/config/Mekanism/machine-usage.toml b/client/overrides/config/Mekanism/machine-usage.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/machine-usage.toml rename to client/overrides/config/Mekanism/machine-usage.toml diff --git a/curseforge/overrides/config/Mekanism/tiers.toml b/client/overrides/config/Mekanism/tiers.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/tiers.toml rename to client/overrides/config/Mekanism/tiers.toml diff --git a/curseforge/overrides/config/Mekanism/world.toml b/client/overrides/config/Mekanism/world.toml similarity index 100% rename from curseforge/overrides/config/Mekanism/world.toml rename to client/overrides/config/Mekanism/world.toml diff --git a/curseforge/overrides/config/ProjectE/client.toml b/client/overrides/config/ProjectE/client.toml similarity index 100% rename from curseforge/overrides/config/ProjectE/client.toml rename to client/overrides/config/ProjectE/client.toml diff --git a/curseforge/overrides/config/ProjectE/common.toml b/client/overrides/config/ProjectE/common.toml similarity index 100% rename from curseforge/overrides/config/ProjectE/common.toml rename to client/overrides/config/ProjectE/common.toml diff --git a/curseforge/overrides/config/ProjectE/custom_emc.json b/client/overrides/config/ProjectE/custom_emc.json similarity index 100% rename from curseforge/overrides/config/ProjectE/custom_emc.json rename to client/overrides/config/ProjectE/custom_emc.json diff --git a/curseforge/overrides/config/ProjectE/mapping.toml b/client/overrides/config/ProjectE/mapping.toml similarity index 100% rename from curseforge/overrides/config/ProjectE/mapping.toml rename to client/overrides/config/ProjectE/mapping.toml diff --git a/curseforge/overrides/config/ProjectE/processing.toml b/client/overrides/config/ProjectE/processing.toml similarity index 100% rename from curseforge/overrides/config/ProjectE/processing.toml rename to client/overrides/config/ProjectE/processing.toml diff --git a/curseforge/overrides/config/ProjectE/server.toml b/client/overrides/config/ProjectE/server.toml similarity index 100% rename from curseforge/overrides/config/ProjectE/server.toml rename to client/overrides/config/ProjectE/server.toml diff --git a/curseforge/overrides/config/additional-additions-config.json b/client/overrides/config/additional-additions-config.json similarity index 87% rename from curseforge/overrides/config/additional-additions-config.json rename to client/overrides/config/additional-additions-config.json index 4ae755b..b3c7b0d 100644 --- a/curseforge/overrides/config/additional-additions-config.json +++ b/client/overrides/config/additional-additions-config.json @@ -1,5 +1,5 @@ { - "version": 6, + "version": 7, "FoodItems": { "FriedEgg": true, "BerryPie": true, @@ -12,7 +12,6 @@ "EnchantmentSpeed": true, "Wrench": true, "CopperPatina": true, - "AmethystLamp": true, "Crossbows": true, "TridentShard": true, "GlowStick": true, @@ -35,5 +34,9 @@ "duration": 5 }, "HastePotions": true, - "BundleRecipe": true + "BundleRecipe": true, + "AmethystLamp": { + "enabled": true, + "despawnChance": 0.5 + } } \ No newline at end of file diff --git a/curseforge/overrides/config/ae2-client.toml b/client/overrides/config/ae2-client.toml similarity index 90% rename from curseforge/overrides/config/ae2-client.toml rename to client/overrides/config/ae2-client.toml index 5282188..14e00a3 100644 --- a/curseforge/overrides/config/ae2-client.toml +++ b/client/overrides/config/ae2-client.toml @@ -24,5 +24,5 @@ #Allowed Values: TALL, FULL, SMALL terminalStyle = "TALL" #Allowed Values: DEFAULT, REMEMBER_SEARCH, AUTO_FOCUS, AUTO_FOCUS_AND_REMEMBER_SEARCH, JEI, REI - terminalSearchMode = "JEI" + terminalSearchMode = "REMEMBER_SEARCH" diff --git a/curseforge/overrides/config/ae2-common.toml b/client/overrides/config/ae2-common.toml similarity index 100% rename from curseforge/overrides/config/ae2-common.toml rename to client/overrides/config/ae2-common.toml diff --git a/curseforge/overrides/config/alexsmobs.toml b/client/overrides/config/alexsmobs.toml similarity index 100% rename from curseforge/overrides/config/alexsmobs.toml rename to client/overrides/config/alexsmobs.toml diff --git a/curseforge/overrides/config/alexsmobs/alligator_snapping_turtle_spawns.json b/client/overrides/config/alexsmobs/alligator_snapping_turtle_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/alligator_snapping_turtle_spawns.json rename to client/overrides/config/alexsmobs/alligator_snapping_turtle_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/anaconda_spawns.json b/client/overrides/config/alexsmobs/anaconda_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/anaconda_spawns.json rename to client/overrides/config/alexsmobs/anaconda_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/anteater_spawns.json b/client/overrides/config/alexsmobs/anteater_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/anteater_spawns.json rename to client/overrides/config/alexsmobs/anteater_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/bald_eagle_spawns.json b/client/overrides/config/alexsmobs/bald_eagle_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/bald_eagle_spawns.json rename to client/overrides/config/alexsmobs/bald_eagle_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/bison_spawns.json b/client/overrides/config/alexsmobs/bison_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/bison_spawns.json rename to client/overrides/config/alexsmobs/bison_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/blobfish_spawns.json b/client/overrides/config/alexsmobs/blobfish_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/blobfish_spawns.json rename to client/overrides/config/alexsmobs/blobfish_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/bone_serpent_spawns.json b/client/overrides/config/alexsmobs/bone_serpent_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/bone_serpent_spawns.json rename to client/overrides/config/alexsmobs/bone_serpent_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/bunfungus_spawns.json b/client/overrides/config/alexsmobs/bunfungus_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/bunfungus_spawns.json rename to client/overrides/config/alexsmobs/bunfungus_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cachalot_whale_beached_spawns.json b/client/overrides/config/alexsmobs/cachalot_whale_beached_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cachalot_whale_beached_spawns.json rename to client/overrides/config/alexsmobs/cachalot_whale_beached_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cachalot_whale_spawns.json b/client/overrides/config/alexsmobs/cachalot_whale_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cachalot_whale_spawns.json rename to client/overrides/config/alexsmobs/cachalot_whale_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/capuchin_monkey_spawns.json b/client/overrides/config/alexsmobs/capuchin_monkey_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/capuchin_monkey_spawns.json rename to client/overrides/config/alexsmobs/capuchin_monkey_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/catfish_huge_spawns.json b/client/overrides/config/alexsmobs/catfish_huge_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/catfish_huge_spawns.json rename to client/overrides/config/alexsmobs/catfish_huge_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/catfish_spawns.json b/client/overrides/config/alexsmobs/catfish_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/catfish_spawns.json rename to client/overrides/config/alexsmobs/catfish_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cave_centipede_spawns.json b/client/overrides/config/alexsmobs/cave_centipede_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cave_centipede_spawns.json rename to client/overrides/config/alexsmobs/cave_centipede_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cockroach_spawns.json b/client/overrides/config/alexsmobs/cockroach_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cockroach_spawns.json rename to client/overrides/config/alexsmobs/cockroach_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/comb_jelly_spawns.json b/client/overrides/config/alexsmobs/comb_jelly_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/comb_jelly_spawns.json rename to client/overrides/config/alexsmobs/comb_jelly_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cosmaw_spawns.json b/client/overrides/config/alexsmobs/cosmaw_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cosmaw_spawns.json rename to client/overrides/config/alexsmobs/cosmaw_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/cosmic_cod_spawns.json b/client/overrides/config/alexsmobs/cosmic_cod_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/cosmic_cod_spawns.json rename to client/overrides/config/alexsmobs/cosmic_cod_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/crimson_mosquito_spawns.json b/client/overrides/config/alexsmobs/crimson_mosquito_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/crimson_mosquito_spawns.json rename to client/overrides/config/alexsmobs/crimson_mosquito_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/crocodile_spawns.json b/client/overrides/config/alexsmobs/crocodile_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/crocodile_spawns.json rename to client/overrides/config/alexsmobs/crocodile_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/crow_spawns.json b/client/overrides/config/alexsmobs/crow_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/crow_spawns.json rename to client/overrides/config/alexsmobs/crow_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/devils_hole_pupfish_spawns.json b/client/overrides/config/alexsmobs/devils_hole_pupfish_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/devils_hole_pupfish_spawns.json rename to client/overrides/config/alexsmobs/devils_hole_pupfish_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/dropbear_spawns.json b/client/overrides/config/alexsmobs/dropbear_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/dropbear_spawns.json rename to client/overrides/config/alexsmobs/dropbear_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/elephant_spawns.json b/client/overrides/config/alexsmobs/elephant_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/elephant_spawns.json rename to client/overrides/config/alexsmobs/elephant_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/emu_spawns.json b/client/overrides/config/alexsmobs/emu_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/emu_spawns.json rename to client/overrides/config/alexsmobs/emu_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/endergrade_spawns.json b/client/overrides/config/alexsmobs/endergrade_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/endergrade_spawns.json rename to client/overrides/config/alexsmobs/endergrade_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/enderiophage_spawns.json b/client/overrides/config/alexsmobs/enderiophage_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/enderiophage_spawns.json rename to client/overrides/config/alexsmobs/enderiophage_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/flutter_spawns.json b/client/overrides/config/alexsmobs/flutter_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/flutter_spawns.json rename to client/overrides/config/alexsmobs/flutter_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/fly_spawns.json b/client/overrides/config/alexsmobs/fly_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/fly_spawns.json rename to client/overrides/config/alexsmobs/fly_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/flying_fish_spawns.json b/client/overrides/config/alexsmobs/flying_fish_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/flying_fish_spawns.json rename to client/overrides/config/alexsmobs/flying_fish_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/frilled_shark_spawns.json b/client/overrides/config/alexsmobs/frilled_shark_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/frilled_shark_spawns.json rename to client/overrides/config/alexsmobs/frilled_shark_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/froststalker_spawns.json b/client/overrides/config/alexsmobs/froststalker_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/froststalker_spawns.json rename to client/overrides/config/alexsmobs/froststalker_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/gazelle_spawns.json b/client/overrides/config/alexsmobs/gazelle_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/gazelle_spawns.json rename to client/overrides/config/alexsmobs/gazelle_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/gelada_monkey_spawns.json b/client/overrides/config/alexsmobs/gelada_monkey_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/gelada_monkey_spawns.json rename to client/overrides/config/alexsmobs/gelada_monkey_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/giant_squid_spawns.json b/client/overrides/config/alexsmobs/giant_squid_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/giant_squid_spawns.json rename to client/overrides/config/alexsmobs/giant_squid_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/gorilla_spawns.json b/client/overrides/config/alexsmobs/gorilla_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/gorilla_spawns.json rename to client/overrides/config/alexsmobs/gorilla_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/grizzly_bear_spawns.json b/client/overrides/config/alexsmobs/grizzly_bear_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/grizzly_bear_spawns.json rename to client/overrides/config/alexsmobs/grizzly_bear_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/guster_spawns.json b/client/overrides/config/alexsmobs/guster_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/guster_spawns.json rename to client/overrides/config/alexsmobs/guster_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/hammerhead_shark_spawns.json b/client/overrides/config/alexsmobs/hammerhead_shark_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/hammerhead_shark_spawns.json rename to client/overrides/config/alexsmobs/hammerhead_shark_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/hummingbird_spawns.json b/client/overrides/config/alexsmobs/hummingbird_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/hummingbird_spawns.json rename to client/overrides/config/alexsmobs/hummingbird_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/jerboa_spawns.json b/client/overrides/config/alexsmobs/jerboa_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/jerboa_spawns.json rename to client/overrides/config/alexsmobs/jerboa_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/kangaroo_spawns.json b/client/overrides/config/alexsmobs/kangaroo_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/kangaroo_spawns.json rename to client/overrides/config/alexsmobs/kangaroo_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/komodo_dragon_spawns.json b/client/overrides/config/alexsmobs/komodo_dragon_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/komodo_dragon_spawns.json rename to client/overrides/config/alexsmobs/komodo_dragon_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/laviathan_spawns.json b/client/overrides/config/alexsmobs/laviathan_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/laviathan_spawns.json rename to client/overrides/config/alexsmobs/laviathan_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/leafcutter_anthill_spawns.json b/client/overrides/config/alexsmobs/leafcutter_anthill_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/leafcutter_anthill_spawns.json rename to client/overrides/config/alexsmobs/leafcutter_anthill_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/lobster_spawns.json b/client/overrides/config/alexsmobs/lobster_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/lobster_spawns.json rename to client/overrides/config/alexsmobs/lobster_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/maned_wolf_spawns.json b/client/overrides/config/alexsmobs/maned_wolf_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/maned_wolf_spawns.json rename to client/overrides/config/alexsmobs/maned_wolf_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/mantis_shrimp_spawns.json b/client/overrides/config/alexsmobs/mantis_shrimp_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/mantis_shrimp_spawns.json rename to client/overrides/config/alexsmobs/mantis_shrimp_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/mimic_octopus_spawns.json b/client/overrides/config/alexsmobs/mimic_octopus_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/mimic_octopus_spawns.json rename to client/overrides/config/alexsmobs/mimic_octopus_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/mimicube_spawns.json b/client/overrides/config/alexsmobs/mimicube_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/mimicube_spawns.json rename to client/overrides/config/alexsmobs/mimicube_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/moose_spawns.json b/client/overrides/config/alexsmobs/moose_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/moose_spawns.json rename to client/overrides/config/alexsmobs/moose_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/mungus_spawns.json b/client/overrides/config/alexsmobs/mungus_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/mungus_spawns.json rename to client/overrides/config/alexsmobs/mungus_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/orca_spawns.json b/client/overrides/config/alexsmobs/orca_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/orca_spawns.json rename to client/overrides/config/alexsmobs/orca_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/platypus_spawns.json b/client/overrides/config/alexsmobs/platypus_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/platypus_spawns.json rename to client/overrides/config/alexsmobs/platypus_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/raccoon_spawns.json b/client/overrides/config/alexsmobs/raccoon_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/raccoon_spawns.json rename to client/overrides/config/alexsmobs/raccoon_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/rattlesnake_spawns.json b/client/overrides/config/alexsmobs/rattlesnake_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/rattlesnake_spawns.json rename to client/overrides/config/alexsmobs/rattlesnake_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/roadrunner_spawns.json b/client/overrides/config/alexsmobs/roadrunner_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/roadrunner_spawns.json rename to client/overrides/config/alexsmobs/roadrunner_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/rocky_roller_spawns.json b/client/overrides/config/alexsmobs/rocky_roller_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/rocky_roller_spawns.json rename to client/overrides/config/alexsmobs/rocky_roller_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/seagull_spawns.json b/client/overrides/config/alexsmobs/seagull_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/seagull_spawns.json rename to client/overrides/config/alexsmobs/seagull_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/seal_spawns.json b/client/overrides/config/alexsmobs/seal_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/seal_spawns.json rename to client/overrides/config/alexsmobs/seal_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/shoebill_spawns.json b/client/overrides/config/alexsmobs/shoebill_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/shoebill_spawns.json rename to client/overrides/config/alexsmobs/shoebill_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/skelewag_spawns.json b/client/overrides/config/alexsmobs/skelewag_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/skelewag_spawns.json rename to client/overrides/config/alexsmobs/skelewag_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/snow_leopard_spawns.json b/client/overrides/config/alexsmobs/snow_leopard_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/snow_leopard_spawns.json rename to client/overrides/config/alexsmobs/snow_leopard_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/soul_vulture_spawns.json b/client/overrides/config/alexsmobs/soul_vulture_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/soul_vulture_spawns.json rename to client/overrides/config/alexsmobs/soul_vulture_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/spectre_spawns.json b/client/overrides/config/alexsmobs/spectre_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/spectre_spawns.json rename to client/overrides/config/alexsmobs/spectre_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/straddler_spawns.json b/client/overrides/config/alexsmobs/straddler_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/straddler_spawns.json rename to client/overrides/config/alexsmobs/straddler_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/stradpole_spawns.json b/client/overrides/config/alexsmobs/stradpole_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/stradpole_spawns.json rename to client/overrides/config/alexsmobs/stradpole_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/sunbird_spawns.json b/client/overrides/config/alexsmobs/sunbird_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/sunbird_spawns.json rename to client/overrides/config/alexsmobs/sunbird_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/tarantula_hawk_spawns.json b/client/overrides/config/alexsmobs/tarantula_hawk_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/tarantula_hawk_spawns.json rename to client/overrides/config/alexsmobs/tarantula_hawk_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/tasmanian_devil_spawns.json b/client/overrides/config/alexsmobs/tasmanian_devil_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/tasmanian_devil_spawns.json rename to client/overrides/config/alexsmobs/tasmanian_devil_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/terrapin_spawns.json b/client/overrides/config/alexsmobs/terrapin_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/terrapin_spawns.json rename to client/overrides/config/alexsmobs/terrapin_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/tiger_spawns.json b/client/overrides/config/alexsmobs/tiger_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/tiger_spawns.json rename to client/overrides/config/alexsmobs/tiger_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/toucan_spawns.json b/client/overrides/config/alexsmobs/toucan_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/toucan_spawns.json rename to client/overrides/config/alexsmobs/toucan_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/tusklin_spawns.json b/client/overrides/config/alexsmobs/tusklin_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/tusklin_spawns.json rename to client/overrides/config/alexsmobs/tusklin_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/void_worm_spawns.json b/client/overrides/config/alexsmobs/void_worm_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/void_worm_spawns.json rename to client/overrides/config/alexsmobs/void_worm_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/warped_mosco_spawns.json b/client/overrides/config/alexsmobs/warped_mosco_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/warped_mosco_spawns.json rename to client/overrides/config/alexsmobs/warped_mosco_spawns.json diff --git a/curseforge/overrides/config/alexsmobs/warped_toad_spawns.json b/client/overrides/config/alexsmobs/warped_toad_spawns.json similarity index 100% rename from curseforge/overrides/config/alexsmobs/warped_toad_spawns.json rename to client/overrides/config/alexsmobs/warped_toad_spawns.json diff --git a/curseforge/overrides/config/ars_nouveau-client.toml b/client/overrides/config/ars_nouveau-client.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau-client.toml rename to client/overrides/config/ars_nouveau-client.toml diff --git a/curseforge/overrides/config/ars_nouveau-common.toml b/client/overrides/config/ars_nouveau-common.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau-common.toml rename to client/overrides/config/ars_nouveau-common.toml diff --git a/curseforge/overrides/config/ars_nouveau/accelerate.toml b/client/overrides/config/ars_nouveau/accelerate.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/accelerate.toml rename to client/overrides/config/ars_nouveau/accelerate.toml diff --git a/curseforge/overrides/config/ars_nouveau/amplify.toml b/client/overrides/config/ars_nouveau/amplify.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/amplify.toml rename to client/overrides/config/ars_nouveau/amplify.toml diff --git a/curseforge/overrides/config/ars_nouveau/aoe.toml b/client/overrides/config/ars_nouveau/aoe.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/aoe.toml rename to client/overrides/config/ars_nouveau/aoe.toml diff --git a/curseforge/overrides/config/ars_nouveau/aquatic.toml b/client/overrides/config/ars_nouveau/aquatic.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/aquatic.toml rename to client/overrides/config/ars_nouveau/aquatic.toml diff --git a/curseforge/overrides/config/ars_nouveau/blink.toml b/client/overrides/config/ars_nouveau/blink.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/blink.toml rename to client/overrides/config/ars_nouveau/blink.toml diff --git a/curseforge/overrides/config/ars_nouveau/bounce.toml b/client/overrides/config/ars_nouveau/bounce.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/bounce.toml rename to client/overrides/config/ars_nouveau/bounce.toml diff --git a/curseforge/overrides/config/ars_nouveau/break.toml b/client/overrides/config/ars_nouveau/break.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/break.toml rename to client/overrides/config/ars_nouveau/break.toml diff --git a/curseforge/overrides/config/ars_nouveau/cold_snap.toml b/client/overrides/config/ars_nouveau/cold_snap.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/cold_snap.toml rename to client/overrides/config/ars_nouveau/cold_snap.toml diff --git a/curseforge/overrides/config/ars_nouveau/conjure_water.toml b/client/overrides/config/ars_nouveau/conjure_water.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/conjure_water.toml rename to client/overrides/config/ars_nouveau/conjure_water.toml diff --git a/curseforge/overrides/config/ars_nouveau/craft.toml b/client/overrides/config/ars_nouveau/craft.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/craft.toml rename to client/overrides/config/ars_nouveau/craft.toml diff --git a/curseforge/overrides/config/ars_nouveau/crush.toml b/client/overrides/config/ars_nouveau/crush.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/crush.toml rename to client/overrides/config/ars_nouveau/crush.toml diff --git a/curseforge/overrides/config/ars_nouveau/cut.toml b/client/overrides/config/ars_nouveau/cut.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/cut.toml rename to client/overrides/config/ars_nouveau/cut.toml diff --git a/curseforge/overrides/config/ars_nouveau/dampen.toml b/client/overrides/config/ars_nouveau/dampen.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/dampen.toml rename to client/overrides/config/ars_nouveau/dampen.toml diff --git a/curseforge/overrides/config/ars_nouveau/delay.toml b/client/overrides/config/ars_nouveau/delay.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/delay.toml rename to client/overrides/config/ars_nouveau/delay.toml diff --git a/curseforge/overrides/config/ars_nouveau/dispel.toml b/client/overrides/config/ars_nouveau/dispel.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/dispel.toml rename to client/overrides/config/ars_nouveau/dispel.toml diff --git a/curseforge/overrides/config/ars_nouveau/duration_down.toml b/client/overrides/config/ars_nouveau/duration_down.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/duration_down.toml rename to client/overrides/config/ars_nouveau/duration_down.toml diff --git a/curseforge/overrides/config/ars_nouveau/ender_inventory.toml b/client/overrides/config/ars_nouveau/ender_inventory.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/ender_inventory.toml rename to client/overrides/config/ars_nouveau/ender_inventory.toml diff --git a/curseforge/overrides/config/ars_nouveau/evaporate.toml b/client/overrides/config/ars_nouveau/evaporate.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/evaporate.toml rename to client/overrides/config/ars_nouveau/evaporate.toml diff --git a/curseforge/overrides/config/ars_nouveau/exchange.toml b/client/overrides/config/ars_nouveau/exchange.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/exchange.toml rename to client/overrides/config/ars_nouveau/exchange.toml diff --git a/curseforge/overrides/config/ars_nouveau/explosion.toml b/client/overrides/config/ars_nouveau/explosion.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/explosion.toml rename to client/overrides/config/ars_nouveau/explosion.toml diff --git a/curseforge/overrides/config/ars_nouveau/extend_time.toml b/client/overrides/config/ars_nouveau/extend_time.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/extend_time.toml rename to client/overrides/config/ars_nouveau/extend_time.toml diff --git a/curseforge/overrides/config/ars_nouveau/extract.toml b/client/overrides/config/ars_nouveau/extract.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/extract.toml rename to client/overrides/config/ars_nouveau/extract.toml diff --git a/curseforge/overrides/config/ars_nouveau/fangs.toml b/client/overrides/config/ars_nouveau/fangs.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/fangs.toml rename to client/overrides/config/ars_nouveau/fangs.toml diff --git a/curseforge/overrides/config/ars_nouveau/fell.toml b/client/overrides/config/ars_nouveau/fell.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/fell.toml rename to client/overrides/config/ars_nouveau/fell.toml diff --git a/curseforge/overrides/config/ars_nouveau/firework.toml b/client/overrides/config/ars_nouveau/firework.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/firework.toml rename to client/overrides/config/ars_nouveau/firework.toml diff --git a/curseforge/overrides/config/ars_nouveau/flare.toml b/client/overrides/config/ars_nouveau/flare.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/flare.toml rename to client/overrides/config/ars_nouveau/flare.toml diff --git a/curseforge/overrides/config/ars_nouveau/fortune.toml b/client/overrides/config/ars_nouveau/fortune.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/fortune.toml rename to client/overrides/config/ars_nouveau/fortune.toml diff --git a/curseforge/overrides/config/ars_nouveau/freeze.toml b/client/overrides/config/ars_nouveau/freeze.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/freeze.toml rename to client/overrides/config/ars_nouveau/freeze.toml diff --git a/curseforge/overrides/config/ars_nouveau/glide.toml b/client/overrides/config/ars_nouveau/glide.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/glide.toml rename to client/overrides/config/ars_nouveau/glide.toml diff --git a/curseforge/overrides/config/ars_nouveau/gravity.toml b/client/overrides/config/ars_nouveau/gravity.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/gravity.toml rename to client/overrides/config/ars_nouveau/gravity.toml diff --git a/curseforge/overrides/config/ars_nouveau/grow.toml b/client/overrides/config/ars_nouveau/grow.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/grow.toml rename to client/overrides/config/ars_nouveau/grow.toml diff --git a/curseforge/overrides/config/ars_nouveau/gust.toml b/client/overrides/config/ars_nouveau/gust.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/gust.toml rename to client/overrides/config/ars_nouveau/gust.toml diff --git a/curseforge/overrides/config/ars_nouveau/harm.toml b/client/overrides/config/ars_nouveau/harm.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/harm.toml rename to client/overrides/config/ars_nouveau/harm.toml diff --git a/curseforge/overrides/config/ars_nouveau/harvest.toml b/client/overrides/config/ars_nouveau/harvest.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/harvest.toml rename to client/overrides/config/ars_nouveau/harvest.toml diff --git a/curseforge/overrides/config/ars_nouveau/heal.toml b/client/overrides/config/ars_nouveau/heal.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/heal.toml rename to client/overrides/config/ars_nouveau/heal.toml diff --git a/curseforge/overrides/config/ars_nouveau/hex.toml b/client/overrides/config/ars_nouveau/hex.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/hex.toml rename to client/overrides/config/ars_nouveau/hex.toml diff --git a/curseforge/overrides/config/ars_nouveau/ignite.toml b/client/overrides/config/ars_nouveau/ignite.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/ignite.toml rename to client/overrides/config/ars_nouveau/ignite.toml diff --git a/curseforge/overrides/config/ars_nouveau/intangible.toml b/client/overrides/config/ars_nouveau/intangible.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/intangible.toml rename to client/overrides/config/ars_nouveau/intangible.toml diff --git a/curseforge/overrides/config/ars_nouveau/interact.toml b/client/overrides/config/ars_nouveau/interact.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/interact.toml rename to client/overrides/config/ars_nouveau/interact.toml diff --git a/curseforge/overrides/config/ars_nouveau/invisibility.toml b/client/overrides/config/ars_nouveau/invisibility.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/invisibility.toml rename to client/overrides/config/ars_nouveau/invisibility.toml diff --git a/curseforge/overrides/config/ars_nouveau/launch.toml b/client/overrides/config/ars_nouveau/launch.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/launch.toml rename to client/overrides/config/ars_nouveau/launch.toml diff --git a/curseforge/overrides/config/ars_nouveau/leap.toml b/client/overrides/config/ars_nouveau/leap.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/leap.toml rename to client/overrides/config/ars_nouveau/leap.toml diff --git a/curseforge/overrides/config/ars_nouveau/light.toml b/client/overrides/config/ars_nouveau/light.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/light.toml rename to client/overrides/config/ars_nouveau/light.toml diff --git a/curseforge/overrides/config/ars_nouveau/lightning.toml b/client/overrides/config/ars_nouveau/lightning.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/lightning.toml rename to client/overrides/config/ars_nouveau/lightning.toml diff --git a/curseforge/overrides/config/ars_nouveau/linger.toml b/client/overrides/config/ars_nouveau/linger.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/linger.toml rename to client/overrides/config/ars_nouveau/linger.toml diff --git a/curseforge/overrides/config/ars_nouveau/orbit.toml b/client/overrides/config/ars_nouveau/orbit.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/orbit.toml rename to client/overrides/config/ars_nouveau/orbit.toml diff --git a/curseforge/overrides/config/ars_nouveau/phantom_block.toml b/client/overrides/config/ars_nouveau/phantom_block.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/phantom_block.toml rename to client/overrides/config/ars_nouveau/phantom_block.toml diff --git a/curseforge/overrides/config/ars_nouveau/pickup.toml b/client/overrides/config/ars_nouveau/pickup.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/pickup.toml rename to client/overrides/config/ars_nouveau/pickup.toml diff --git a/curseforge/overrides/config/ars_nouveau/pierce.toml b/client/overrides/config/ars_nouveau/pierce.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/pierce.toml rename to client/overrides/config/ars_nouveau/pierce.toml diff --git a/curseforge/overrides/config/ars_nouveau/place_block.toml b/client/overrides/config/ars_nouveau/place_block.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/place_block.toml rename to client/overrides/config/ars_nouveau/place_block.toml diff --git a/curseforge/overrides/config/ars_nouveau/projectile.toml b/client/overrides/config/ars_nouveau/projectile.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/projectile.toml rename to client/overrides/config/ars_nouveau/projectile.toml diff --git a/curseforge/overrides/config/ars_nouveau/pull.toml b/client/overrides/config/ars_nouveau/pull.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/pull.toml rename to client/overrides/config/ars_nouveau/pull.toml diff --git a/curseforge/overrides/config/ars_nouveau/redstone_signal.toml b/client/overrides/config/ars_nouveau/redstone_signal.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/redstone_signal.toml rename to client/overrides/config/ars_nouveau/redstone_signal.toml diff --git a/curseforge/overrides/config/ars_nouveau/rune.toml b/client/overrides/config/ars_nouveau/rune.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/rune.toml rename to client/overrides/config/ars_nouveau/rune.toml diff --git a/curseforge/overrides/config/ars_nouveau/self.toml b/client/overrides/config/ars_nouveau/self.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/self.toml rename to client/overrides/config/ars_nouveau/self.toml diff --git a/curseforge/overrides/config/ars_nouveau/sensitive.toml b/client/overrides/config/ars_nouveau/sensitive.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/sensitive.toml rename to client/overrides/config/ars_nouveau/sensitive.toml diff --git a/curseforge/overrides/config/ars_nouveau/slowfall.toml b/client/overrides/config/ars_nouveau/slowfall.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/slowfall.toml rename to client/overrides/config/ars_nouveau/slowfall.toml diff --git a/curseforge/overrides/config/ars_nouveau/smelt.toml b/client/overrides/config/ars_nouveau/smelt.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/smelt.toml rename to client/overrides/config/ars_nouveau/smelt.toml diff --git a/curseforge/overrides/config/ars_nouveau/snare.toml b/client/overrides/config/ars_nouveau/snare.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/snare.toml rename to client/overrides/config/ars_nouveau/snare.toml diff --git a/curseforge/overrides/config/ars_nouveau/split.toml b/client/overrides/config/ars_nouveau/split.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/split.toml rename to client/overrides/config/ars_nouveau/split.toml diff --git a/curseforge/overrides/config/ars_nouveau/summon_decoy.toml b/client/overrides/config/ars_nouveau/summon_decoy.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/summon_decoy.toml rename to client/overrides/config/ars_nouveau/summon_decoy.toml diff --git a/curseforge/overrides/config/ars_nouveau/summon_steed.toml b/client/overrides/config/ars_nouveau/summon_steed.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/summon_steed.toml rename to client/overrides/config/ars_nouveau/summon_steed.toml diff --git a/curseforge/overrides/config/ars_nouveau/summon_vex.toml b/client/overrides/config/ars_nouveau/summon_vex.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/summon_vex.toml rename to client/overrides/config/ars_nouveau/summon_vex.toml diff --git a/curseforge/overrides/config/ars_nouveau/summon_wolves.toml b/client/overrides/config/ars_nouveau/summon_wolves.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/summon_wolves.toml rename to client/overrides/config/ars_nouveau/summon_wolves.toml diff --git a/curseforge/overrides/config/ars_nouveau/toss.toml b/client/overrides/config/ars_nouveau/toss.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/toss.toml rename to client/overrides/config/ars_nouveau/toss.toml diff --git a/curseforge/overrides/config/ars_nouveau/touch.toml b/client/overrides/config/ars_nouveau/touch.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/touch.toml rename to client/overrides/config/ars_nouveau/touch.toml diff --git a/curseforge/overrides/config/ars_nouveau/underfoot.toml b/client/overrides/config/ars_nouveau/underfoot.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/underfoot.toml rename to client/overrides/config/ars_nouveau/underfoot.toml diff --git a/curseforge/overrides/config/ars_nouveau/wind_shear.toml b/client/overrides/config/ars_nouveau/wind_shear.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/wind_shear.toml rename to client/overrides/config/ars_nouveau/wind_shear.toml diff --git a/curseforge/overrides/config/ars_nouveau/wither.toml b/client/overrides/config/ars_nouveau/wither.toml similarity index 100% rename from curseforge/overrides/config/ars_nouveau/wither.toml rename to client/overrides/config/ars_nouveau/wither.toml diff --git a/curseforge/overrides/config/awesomedungeon_general_.properties b/client/overrides/config/awesomedungeon_general_.properties similarity index 76% rename from curseforge/overrides/config/awesomedungeon_general_.properties rename to client/overrides/config/awesomedungeon_general_.properties index 1fefbdc..cf3292b 100644 --- a/curseforge/overrides/config/awesomedungeon_general_.properties +++ b/client/overrides/config/awesomedungeon_general_.properties @@ -1,3 +1,3 @@ #need help ? http://adfoc.us/70606381270177 -#Mon May 23 11:26:11 CDT 2022 +#Mon May 30 12:42:44 CDT 2022 key.patreon.unlock.rewards=https\://www.patreon.com/jtorleon diff --git a/curseforge/overrides/config/awesomedungeonend_general_.properties b/client/overrides/config/awesomedungeonend_general_.properties similarity index 76% rename from curseforge/overrides/config/awesomedungeonend_general_.properties rename to client/overrides/config/awesomedungeonend_general_.properties index 317f1fb..04d6cab 100644 --- a/curseforge/overrides/config/awesomedungeonend_general_.properties +++ b/client/overrides/config/awesomedungeonend_general_.properties @@ -1,3 +1,3 @@ #need help ? http://adfoc.us/70606381270177 -#Mon May 23 11:26:09 CDT 2022 +#Mon May 30 12:42:43 CDT 2022 key.patreon.unlock.rewards=https\://www.patreon.com/jtorleon diff --git a/curseforge/overrides/config/awesomedungeonnether_general_.properties b/client/overrides/config/awesomedungeonnether_general_.properties similarity index 76% rename from curseforge/overrides/config/awesomedungeonnether_general_.properties rename to client/overrides/config/awesomedungeonnether_general_.properties index 499f6b0..6667717 100644 --- a/curseforge/overrides/config/awesomedungeonnether_general_.properties +++ b/client/overrides/config/awesomedungeonnether_general_.properties @@ -1,3 +1,3 @@ #need help ? http://adfoc.us/70606381270177 -#Mon May 23 11:26:15 CDT 2022 +#Mon May 30 12:42:49 CDT 2022 key.patreon.unlock.rewards=https\://www.patreon.com/jtorleon diff --git a/curseforge/overrides/config/betterfpsdist-common.toml b/client/overrides/config/betterfpsdist-common.toml similarity index 100% rename from curseforge/overrides/config/betterfpsdist-common.toml rename to client/overrides/config/betterfpsdist-common.toml diff --git a/curseforge/overrides/config/bettermineshafts-forge-1_18.toml b/client/overrides/config/bettermineshafts-forge-1_18.toml similarity index 100% rename from curseforge/overrides/config/bettermineshafts-forge-1_18.toml rename to client/overrides/config/bettermineshafts-forge-1_18.toml diff --git a/curseforge/overrides/config/bettermineshafts/README.txt b/client/overrides/config/bettermineshafts/README.txt similarity index 100% rename from curseforge/overrides/config/bettermineshafts/README.txt rename to client/overrides/config/bettermineshafts/README.txt diff --git a/curseforge/overrides/config/bettermineshafts/forge-1_18_2/README.txt b/client/overrides/config/bettermineshafts/forge-1_18_2/README.txt similarity index 100% rename from curseforge/overrides/config/bettermineshafts/forge-1_18_2/README.txt rename to client/overrides/config/bettermineshafts/forge-1_18_2/README.txt diff --git a/curseforge/overrides/config/beyond_earth-common.toml b/client/overrides/config/beyond_earth-common.toml similarity index 100% rename from curseforge/overrides/config/beyond_earth-common.toml rename to client/overrides/config/beyond_earth-common.toml diff --git a/curseforge/overrides/config/biomesoplenty/biome_toggles.json b/client/overrides/config/biomesoplenty/biome_toggles.json similarity index 100% rename from curseforge/overrides/config/biomesoplenty/biome_toggles.json rename to client/overrides/config/biomesoplenty/biome_toggles.json diff --git a/curseforge/overrides/config/biomesoplenty/generation.toml b/client/overrides/config/biomesoplenty/generation.toml similarity index 100% rename from curseforge/overrides/config/biomesoplenty/generation.toml rename to client/overrides/config/biomesoplenty/generation.toml diff --git a/curseforge/overrides/config/botania-client.toml b/client/overrides/config/botania-client.toml similarity index 100% rename from curseforge/overrides/config/botania-client.toml rename to client/overrides/config/botania-client.toml diff --git a/curseforge/overrides/config/botania-common.toml b/client/overrides/config/botania-common.toml similarity index 100% rename from curseforge/overrides/config/botania-common.toml rename to client/overrides/config/botania-common.toml diff --git a/client/overrides/config/cfm-client.toml b/client/overrides/config/cfm-client.toml new file mode 100644 index 0000000..0e7ce14 --- /dev/null +++ b/client/overrides/config/cfm-client.toml @@ -0,0 +1,6 @@ + +#Client configuration settings +[client] + #Draws the collision shape rather than the selection shape when hovering blocks. Used for debugging collisions. + drawCollisionShapes = false + diff --git a/client/overrides/config/cfm-common.toml b/client/overrides/config/cfm-common.toml new file mode 100644 index 0000000..31950bb --- /dev/null +++ b/client/overrides/config/cfm-common.toml @@ -0,0 +1,10 @@ + +#Mail configuration settings +[mail] + #The maximum amount of mail that can be in a player's mail queue. + #Range: > 1 + maxMailQueue = 20 + #The interval in ticks for mail boxes to pull mail from the player's queue + #Range: > 1 + pullMailInterval = 20 + diff --git a/curseforge/overrides/config/chiselsandbits-client.toml b/client/overrides/config/chiselsandbits-client.toml similarity index 100% rename from curseforge/overrides/config/chiselsandbits-client.toml rename to client/overrides/config/chiselsandbits-client.toml diff --git a/curseforge/overrides/config/chiselsandbits-common.toml b/client/overrides/config/chiselsandbits-common.toml similarity index 100% rename from curseforge/overrides/config/chiselsandbits-common.toml rename to client/overrides/config/chiselsandbits-common.toml diff --git a/curseforge/overrides/config/citadel-common.toml b/client/overrides/config/citadel-common.toml similarity index 100% rename from curseforge/overrides/config/citadel-common.toml rename to client/overrides/config/citadel-common.toml diff --git a/curseforge/overrides/config/cofh_core-client.toml b/client/overrides/config/cofh_core-client.toml similarity index 100% rename from curseforge/overrides/config/cofh_core-client.toml rename to client/overrides/config/cofh_core-client.toml diff --git a/curseforge/overrides/config/computercraft-client.toml b/client/overrides/config/computercraft-client.toml similarity index 100% rename from curseforge/overrides/config/computercraft-client.toml rename to client/overrides/config/computercraft-client.toml diff --git a/curseforge/overrides/config/create-client.toml b/client/overrides/config/create-client.toml similarity index 100% rename from curseforge/overrides/config/create-client.toml rename to client/overrides/config/create-client.toml diff --git a/curseforge/overrides/config/create-common.toml b/client/overrides/config/create-common.toml similarity index 100% rename from curseforge/overrides/config/create-common.toml rename to client/overrides/config/create-common.toml diff --git a/curseforge/overrides/config/createaddition-common.toml b/client/overrides/config/createaddition-common.toml similarity index 81% rename from curseforge/overrides/config/createaddition-common.toml rename to client/overrides/config/createaddition-common.toml index 98835fc..6fc48f3 100644 --- a/curseforge/overrides/config/createaddition-common.toml +++ b/client/overrides/config/createaddition-common.toml @@ -16,25 +16,13 @@ #General Settings [general] - #Forge Energy conversion rate (in FE/t at max RPM). + #Forge Energy conversion rate (in FE/t at 256 RPM). #Range: > 0 fe_conversion = 240 - #Max stress for the Alternator and Electric Motor (in SU at max RPM). + #Max stress for the Alternator and Electric Motor (in SU at 256 RPM). #Range: > 0 baseline_stress = 8192 -#Charger (Deprecated) -[charger] - #Charger max input in FE/t (Energy transfer). - #Range: > 0 - charger_max_input = 8192 - #Charger charge rate in FE/t. - #Range: > 0 - charger_charge_rate = 8192 - #Charger internal capacity in FE. - #Range: > 0 - charger_capacity = 32000 - #Electric Motor [electric_motor] #Electric Motor internal capacity in FE. @@ -78,9 +66,6 @@ #Hurt range (in blocks/meters). #Range: > 0 tesla_coil_hurt_range = 3 - #The chance that a AE2 Certus Quartz will be turned into Charged Certus Quartz for every tick. - #Range: 0.0 ~ 1.0 - certus_quartz_charge_chance = 0.96 #Charger internal capacity in FE. #Range: > 0 tesla_coil_capacity = 32000 @@ -147,9 +132,6 @@ #The relative speed of the Furnace Engine when powered by a Crude Burner. #Range: 0.0 ~ 100.0 crude_burner_engine_speed = 2.0 - #The energy cost of turning Chromatic Compound into Overcharged Alloy. - #Range: > 1 - overcharging_energy_cost = 16777216 #The relative speed of the Furnace Engine when powered by a Furnace Burner. #Range: 0.0 ~ 100.0 furnace_burner_engine_speed = 1.0 diff --git a/curseforge/overrides/config/createdeco-client.toml b/client/overrides/config/createdeco-client.toml similarity index 100% rename from curseforge/overrides/config/createdeco-client.toml rename to client/overrides/config/createdeco-client.toml diff --git a/curseforge/overrides/config/createdeco-common.toml b/client/overrides/config/createdeco-common.toml similarity index 100% rename from curseforge/overrides/config/createdeco-common.toml rename to client/overrides/config/createdeco-common.toml diff --git a/curseforge/overrides/config/cucumber-client.toml b/client/overrides/config/cucumber-client.toml similarity index 100% rename from curseforge/overrides/config/cucumber-client.toml rename to client/overrides/config/cucumber-client.toml diff --git a/curseforge/overrides/config/cucumber-common.toml b/client/overrides/config/cucumber-common.toml similarity index 100% rename from curseforge/overrides/config/cucumber-common.toml rename to client/overrides/config/cucumber-common.toml diff --git a/curseforge/overrides/config/cucumber-tags.json b/client/overrides/config/cucumber-tags.json similarity index 100% rename from curseforge/overrides/config/cucumber-tags.json rename to client/overrides/config/cucumber-tags.json diff --git a/curseforge/overrides/config/curios-client.toml b/client/overrides/config/curios-client.toml similarity index 100% rename from curseforge/overrides/config/curios-client.toml rename to client/overrides/config/curios-client.toml diff --git a/curseforge/overrides/config/decorative_blocks-common.toml b/client/overrides/config/decorative_blocks-common.toml similarity index 100% rename from curseforge/overrides/config/decorative_blocks-common.toml rename to client/overrides/config/decorative_blocks-common.toml diff --git a/curseforge/overrides/config/ding.toml b/client/overrides/config/ding.toml similarity index 100% rename from curseforge/overrides/config/ding.toml rename to client/overrides/config/ding.toml diff --git a/curseforge/overrides/config/dynview-common.toml b/client/overrides/config/dynview-common.toml similarity index 100% rename from curseforge/overrides/config/dynview-common.toml rename to client/overrides/config/dynview-common.toml diff --git a/curseforge/overrides/config/enderchests-client.toml b/client/overrides/config/enderchests-client.toml similarity index 100% rename from curseforge/overrides/config/enderchests-client.toml rename to client/overrides/config/enderchests-client.toml diff --git a/curseforge/overrides/config/enderchests.toml b/client/overrides/config/enderchests.toml similarity index 100% rename from curseforge/overrides/config/enderchests.toml rename to client/overrides/config/enderchests.toml diff --git a/curseforge/overrides/config/endertanks-client.toml b/client/overrides/config/endertanks-client.toml similarity index 100% rename from curseforge/overrides/config/endertanks-client.toml rename to client/overrides/config/endertanks-client.toml diff --git a/curseforge/overrides/config/endertanks.toml b/client/overrides/config/endertanks.toml similarity index 100% rename from curseforge/overrides/config/endertanks.toml rename to client/overrides/config/endertanks.toml diff --git a/curseforge/overrides/config/extremereactors/client.toml b/client/overrides/config/extremereactors/client.toml similarity index 100% rename from curseforge/overrides/config/extremereactors/client.toml rename to client/overrides/config/extremereactors/client.toml diff --git a/curseforge/overrides/config/extremereactors/common.toml b/client/overrides/config/extremereactors/common.toml similarity index 100% rename from curseforge/overrides/config/extremereactors/common.toml rename to client/overrides/config/extremereactors/common.toml diff --git a/curseforge/overrides/config/farmersdelight-client.toml b/client/overrides/config/farmersdelight-client.toml similarity index 100% rename from curseforge/overrides/config/farmersdelight-client.toml rename to client/overrides/config/farmersdelight-client.toml diff --git a/curseforge/overrides/config/farmersdelight-common.toml b/client/overrides/config/farmersdelight-common.toml similarity index 100% rename from curseforge/overrides/config/farmersdelight-common.toml rename to client/overrides/config/farmersdelight-common.toml diff --git a/curseforge/overrides/config/farmersrespite-common.toml b/client/overrides/config/farmersrespite-common.toml similarity index 100% rename from curseforge/overrides/config/farmersrespite-common.toml rename to client/overrides/config/farmersrespite-common.toml diff --git a/curseforge/overrides/config/ferritecore-mixin.toml b/client/overrides/config/ferritecore-mixin.toml similarity index 100% rename from curseforge/overrides/config/ferritecore-mixin.toml rename to client/overrides/config/ferritecore-mixin.toml diff --git a/curseforge/overrides/config/flywheel-client.toml b/client/overrides/config/flywheel-client.toml similarity index 100% rename from curseforge/overrides/config/flywheel-client.toml rename to client/overrides/config/flywheel-client.toml diff --git a/curseforge/overrides/config/fml.toml b/client/overrides/config/fml.toml similarity index 100% rename from curseforge/overrides/config/fml.toml rename to client/overrides/config/fml.toml diff --git a/curseforge/overrides/config/forge-client.toml b/client/overrides/config/forge-client.toml similarity index 100% rename from curseforge/overrides/config/forge-client.toml rename to client/overrides/config/forge-client.toml diff --git a/curseforge/overrides/config/forge-common.toml b/client/overrides/config/forge-common.toml similarity index 100% rename from curseforge/overrides/config/forge-common.toml rename to client/overrides/config/forge-common.toml diff --git a/curseforge/overrides/config/immersiveengineering-client.toml b/client/overrides/config/immersiveengineering-client.toml similarity index 100% rename from curseforge/overrides/config/immersiveengineering-client.toml rename to client/overrides/config/immersiveengineering-client.toml diff --git a/curseforge/overrides/config/immersiveengineering-common.toml b/client/overrides/config/immersiveengineering-common.toml similarity index 100% rename from curseforge/overrides/config/immersiveengineering-common.toml rename to client/overrides/config/immersiveengineering-common.toml diff --git a/curseforge/overrides/config/ironchests/chests/copper.json b/client/overrides/config/ironchests/chests/copper.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/copper.json rename to client/overrides/config/ironchests/chests/copper.json diff --git a/curseforge/overrides/config/ironchests/chests/crystal.json b/client/overrides/config/ironchests/chests/crystal.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/crystal.json rename to client/overrides/config/ironchests/chests/crystal.json diff --git a/curseforge/overrides/config/ironchests/chests/diamond.json b/client/overrides/config/ironchests/chests/diamond.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/diamond.json rename to client/overrides/config/ironchests/chests/diamond.json diff --git a/curseforge/overrides/config/ironchests/chests/dirt.json b/client/overrides/config/ironchests/chests/dirt.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/dirt.json rename to client/overrides/config/ironchests/chests/dirt.json diff --git a/curseforge/overrides/config/ironchests/chests/gold.json b/client/overrides/config/ironchests/chests/gold.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/gold.json rename to client/overrides/config/ironchests/chests/gold.json diff --git a/curseforge/overrides/config/ironchests/chests/iron.json b/client/overrides/config/ironchests/chests/iron.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/iron.json rename to client/overrides/config/ironchests/chests/iron.json diff --git a/curseforge/overrides/config/ironchests/chests/netherite.json b/client/overrides/config/ironchests/chests/netherite.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/netherite.json rename to client/overrides/config/ironchests/chests/netherite.json diff --git a/curseforge/overrides/config/ironchests/chests/obsidian.json b/client/overrides/config/ironchests/chests/obsidian.json similarity index 100% rename from curseforge/overrides/config/ironchests/chests/obsidian.json rename to client/overrides/config/ironchests/chests/obsidian.json diff --git a/curseforge/overrides/config/ironfurnaces.toml b/client/overrides/config/ironchests/defaults.lock similarity index 100% rename from curseforge/overrides/config/ironfurnaces.toml rename to client/overrides/config/ironchests/defaults.lock diff --git a/curseforge/overrides/config/ironchests/upgrade_types/copper.json b/client/overrides/config/ironchests/upgrade_types/copper.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/copper.json rename to client/overrides/config/ironchests/upgrade_types/copper.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/crystal.json b/client/overrides/config/ironchests/upgrade_types/crystal.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/crystal.json rename to client/overrides/config/ironchests/upgrade_types/crystal.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/diamond.json b/client/overrides/config/ironchests/upgrade_types/diamond.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/diamond.json rename to client/overrides/config/ironchests/upgrade_types/diamond.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/gold.json b/client/overrides/config/ironchests/upgrade_types/gold.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/gold.json rename to client/overrides/config/ironchests/upgrade_types/gold.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/iron.json b/client/overrides/config/ironchests/upgrade_types/iron.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/iron.json rename to client/overrides/config/ironchests/upgrade_types/iron.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/netherite.json b/client/overrides/config/ironchests/upgrade_types/netherite.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/netherite.json rename to client/overrides/config/ironchests/upgrade_types/netherite.json diff --git a/curseforge/overrides/config/ironchests/upgrade_types/obsidian.json b/client/overrides/config/ironchests/upgrade_types/obsidian.json similarity index 100% rename from curseforge/overrides/config/ironchests/upgrade_types/obsidian.json rename to client/overrides/config/ironchests/upgrade_types/obsidian.json diff --git a/curseforge/overrides/config/ironfurnaces-client.toml b/client/overrides/config/ironfurnaces-client.toml similarity index 100% rename from curseforge/overrides/config/ironfurnaces-client.toml rename to client/overrides/config/ironfurnaces-client.toml diff --git a/client/overrides/config/ironfurnaces.toml b/client/overrides/config/ironfurnaces.toml new file mode 100644 index 0000000..e69de29 diff --git a/curseforge/overrides/config/ironjetpacks-client.toml b/client/overrides/config/ironjetpacks-client.toml similarity index 100% rename from curseforge/overrides/config/ironjetpacks-client.toml rename to client/overrides/config/ironjetpacks-client.toml diff --git a/curseforge/overrides/config/ironjetpacks-common.toml b/client/overrides/config/ironjetpacks-common.toml similarity index 75% rename from curseforge/overrides/config/ironjetpacks-common.toml rename to client/overrides/config/ironjetpacks-common.toml index d4c7cfc..a57c41a 100644 --- a/curseforge/overrides/config/ironjetpacks-common.toml +++ b/client/overrides/config/ironjetpacks-common.toml @@ -1,8 +1,10 @@ #General configuration options. [General] - #Should jetpacks be enachantable? + #Should jetpacks be enchantable? enchantableJetpacks = false + #Enable Curios integration. + curiosIntegration = true #Dynamic recipe options. [Recipe] diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/bronze.json b/client/overrides/config/ironjetpacks/jetpacks/bronze.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/bronze.json rename to client/overrides/config/ironjetpacks/jetpacks/bronze.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/copper.json b/client/overrides/config/ironjetpacks/jetpacks/copper.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/copper.json rename to client/overrides/config/ironjetpacks/jetpacks/copper.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/creative.json b/client/overrides/config/ironjetpacks/jetpacks/creative.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/creative.json rename to client/overrides/config/ironjetpacks/jetpacks/creative.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/diamond.json b/client/overrides/config/ironjetpacks/jetpacks/diamond.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/diamond.json rename to client/overrides/config/ironjetpacks/jetpacks/diamond.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/electrum.json b/client/overrides/config/ironjetpacks/jetpacks/electrum.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/electrum.json rename to client/overrides/config/ironjetpacks/jetpacks/electrum.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/emerald.json b/client/overrides/config/ironjetpacks/jetpacks/emerald.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/emerald.json rename to client/overrides/config/ironjetpacks/jetpacks/emerald.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/gold.json b/client/overrides/config/ironjetpacks/jetpacks/gold.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/gold.json rename to client/overrides/config/ironjetpacks/jetpacks/gold.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/invar.json b/client/overrides/config/ironjetpacks/jetpacks/invar.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/invar.json rename to client/overrides/config/ironjetpacks/jetpacks/invar.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/iron.json b/client/overrides/config/ironjetpacks/jetpacks/iron.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/iron.json rename to client/overrides/config/ironjetpacks/jetpacks/iron.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/platinum.json b/client/overrides/config/ironjetpacks/jetpacks/platinum.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/platinum.json rename to client/overrides/config/ironjetpacks/jetpacks/platinum.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/silver.json b/client/overrides/config/ironjetpacks/jetpacks/silver.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/silver.json rename to client/overrides/config/ironjetpacks/jetpacks/silver.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/steel.json b/client/overrides/config/ironjetpacks/jetpacks/steel.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/steel.json rename to client/overrides/config/ironjetpacks/jetpacks/steel.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/stone.json b/client/overrides/config/ironjetpacks/jetpacks/stone.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/stone.json rename to client/overrides/config/ironjetpacks/jetpacks/stone.json diff --git a/curseforge/overrides/config/ironjetpacks/jetpacks/wood.json b/client/overrides/config/ironjetpacks/jetpacks/wood.json similarity index 100% rename from curseforge/overrides/config/ironjetpacks/jetpacks/wood.json rename to client/overrides/config/ironjetpacks/jetpacks/wood.json diff --git a/curseforge/overrides/config/jei-client.toml b/client/overrides/config/jei-client.toml similarity index 100% rename from curseforge/overrides/config/jei-client.toml rename to client/overrides/config/jei-client.toml diff --git a/curseforge/overrides/config/jei/ingredient-list-mod-sort-order.ini b/client/overrides/config/jei/ingredient-list-mod-sort-order.ini similarity index 91% rename from curseforge/overrides/config/jei/ingredient-list-mod-sort-order.ini rename to client/overrides/config/jei/ingredient-list-mod-sort-order.ini index b7796cb..1e9e1df 100644 --- a/curseforge/overrides/config/jei/ingredient-list-mod-sort-order.ini +++ b/client/overrides/config/jei/ingredient-list-mod-sort-order.ini @@ -55,3 +55,8 @@ Thermal Expansion Thermal Locomotion Thermal Series Zero CORE 2 +Advanced Peripherals +Electrodynamics +MrCrayfish's Furniture Mod +Pipez +Thermal Innovation diff --git a/curseforge/overrides/config/jei/ingredient-list-type-sort-order.ini b/client/overrides/config/jei/ingredient-list-type-sort-order.ini similarity index 100% rename from curseforge/overrides/config/jei/ingredient-list-type-sort-order.ini rename to client/overrides/config/jei/ingredient-list-type-sort-order.ini diff --git a/curseforge/overrides/config/jei/recipe-category-sort-order.ini b/client/overrides/config/jei/recipe-category-sort-order.ini similarity index 90% rename from curseforge/overrides/config/jei/recipe-category-sort-order.ini rename to client/overrides/config/jei/recipe-category-sort-order.ini index d3c86cb..6535ff4 100644 --- a/curseforge/overrides/config/jei/recipe-category-sort-order.ini +++ b/client/overrides/config/jei/recipe-category-sort-order.ini @@ -193,3 +193,17 @@ thermal:smelter thermal:smelter_catalyst thermal:stirling_fuel thermal:tree_extractor +minecraft:mod_blasting +minecraft:smelting +electrodynamics:chemical_crystallizer_recipe +electrodynamics:chemical_mixer_recipe +electrodynamics:electrolytic_separator_recipe +electrodynamics:energized_alloyer_recipe +electrodynamics:fermentation_plant_recipe +electrodynamics:lathe_recipe +electrodynamics:mineral_crusher_recipe +electrodynamics:mineral_grinder_recipe +electrodynamics:mineral_washer_recipe +electrodynamics:oxidation_furnace_recipe +electrodynamics:reinforced_alloyer_recipe +electrodynamics:wire_mill_recipe diff --git a/client/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini b/client/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini new file mode 100644 index 0000000..08b81eb --- /dev/null +++ b/client/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini @@ -0,0 +1,10 @@ +T:{Count:1b,id:"create:stressometer"} +T:{Count:1b,id:"minecraft:coal"} +T:{Count:1b,id:"immersiveengineering:electric_lantern"} +T:{Count:1b,id:"mekanism:pressure_disperser"} +T:{Count:1b,id:"mekanismgenerators:turbine_vent"} +T:{Count:1b,id:"minecraft:andesite"} +T:{Count:1b,id:"minecraft:scaffolding"} +T:{Count:1b,id:"mekanism:gauge_dropper"} +T:{Count:1b,id:"minecraft:glowstone_dust"} +T:{Count:1b,id:"minecraft:oak_log"} diff --git a/curseforge/overrides/config/mahoutsukai-client.toml b/client/overrides/config/mahoutsukai-client.toml similarity index 100% rename from curseforge/overrides/config/mahoutsukai-client.toml rename to client/overrides/config/mahoutsukai-client.toml diff --git a/curseforge/overrides/config/mantle-client.toml b/client/overrides/config/mantle-client.toml similarity index 100% rename from curseforge/overrides/config/mantle-client.toml rename to client/overrides/config/mantle-client.toml diff --git a/curseforge/overrides/config/mcjtylib-client.toml b/client/overrides/config/mcjtylib-client.toml similarity index 100% rename from curseforge/overrides/config/mcjtylib-client.toml rename to client/overrides/config/mcjtylib-client.toml diff --git a/curseforge/overrides/config/mysticalagriculture-client.toml b/client/overrides/config/mysticalagriculture-client.toml similarity index 100% rename from curseforge/overrides/config/mysticalagriculture-client.toml rename to client/overrides/config/mysticalagriculture-client.toml diff --git a/curseforge/overrides/config/mysticalagriculture-common.toml b/client/overrides/config/mysticalagriculture-common.toml similarity index 100% rename from curseforge/overrides/config/mysticalagriculture-common.toml rename to client/overrides/config/mysticalagriculture-common.toml diff --git a/curseforge/overrides/config/mythicbotany-client.toml b/client/overrides/config/mythicbotany-client.toml similarity index 100% rename from curseforge/overrides/config/mythicbotany-client.toml rename to client/overrides/config/mythicbotany-client.toml diff --git a/curseforge/overrides/config/mythicbotany.json5 b/client/overrides/config/mythicbotany.json5 similarity index 100% rename from curseforge/overrides/config/mythicbotany.json5 rename to client/overrides/config/mythicbotany.json5 diff --git a/curseforge/overrides/config/oculus.properties b/client/overrides/config/oculus.properties similarity index 82% rename from curseforge/overrides/config/oculus.properties rename to client/overrides/config/oculus.properties index 715066d..e09edff 100644 --- a/curseforge/overrides/config/oculus.properties +++ b/client/overrides/config/oculus.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Wed May 25 14:26:39 CDT 2022 +#Mon May 30 12:43:51 CDT 2022 enableDebug=false maxShadowRenderDistance=9 shaderPack= diff --git a/curseforge/overrides/config/patchouli-client-1.toml.bak b/client/overrides/config/patchouli-client-1.toml.bak similarity index 100% rename from curseforge/overrides/config/patchouli-client-1.toml.bak rename to client/overrides/config/patchouli-client-1.toml.bak diff --git a/curseforge/overrides/config/patchouli-client-2.toml.bak b/client/overrides/config/patchouli-client-2.toml.bak similarity index 100% rename from curseforge/overrides/config/patchouli-client-2.toml.bak rename to client/overrides/config/patchouli-client-2.toml.bak diff --git a/curseforge/overrides/config/patchouli-client-3.toml.bak b/client/overrides/config/patchouli-client-3.toml.bak similarity index 100% rename from curseforge/overrides/config/patchouli-client-3.toml.bak rename to client/overrides/config/patchouli-client-3.toml.bak diff --git a/curseforge/overrides/config/patchouli-client-4.toml.bak b/client/overrides/config/patchouli-client-4.toml.bak similarity index 100% rename from curseforge/overrides/config/patchouli-client-4.toml.bak rename to client/overrides/config/patchouli-client-4.toml.bak diff --git a/curseforge/overrides/config/patchouli-client.toml b/client/overrides/config/patchouli-client-5.toml.bak similarity index 100% rename from curseforge/overrides/config/patchouli-client.toml rename to client/overrides/config/patchouli-client-5.toml.bak diff --git a/curseforge/overrides/config/patchouli-client-5.toml.bak b/client/overrides/config/patchouli-client.toml similarity index 98% rename from curseforge/overrides/config/patchouli-client-5.toml.bak rename to client/overrides/config/patchouli-client.toml index 2b09b00..b864fa7 100644 --- a/curseforge/overrides/config/patchouli-client-5.toml.bak +++ b/client/overrides/config/patchouli-client.toml @@ -1,14 +1,14 @@ -#Set this to true to disable advancement locking for ALL books, making all entries visible at all times. Config Flag: advancements_disabled -disableAdvancementLocking = false -#Granular list of Book ID's to disable advancement locking for, e.g. [ "botania:lexicon" ]. Config Flags: advancements_disabled_ -noAdvancementBooks = [] -#Enable testing mode. By default this doesn't do anything, but you can use the config flag in your books if you want. Config Flag: testing_mode -testingMode = false -#Set this to the ID of a book to have it show up in players' inventories, replacing the recipe book. -inventoryButtonBook = "" -#Set this to true to use Shift instead of Ctrl for the inventory quick lookup feature. -useShiftForQuickLookup = false -#Set how text overflow should be coped with: overflow the text off the page, truncate overflowed text, or resize everything to fit. Relogin after changing. -#Allowed Values: OVERFLOW, TRUNCATE, RESIZE -textOverflowMode = "RESIZE" - +#Set this to true to disable advancement locking for ALL books, making all entries visible at all times. Config Flag: advancements_disabled +disableAdvancementLocking = false +#Granular list of Book ID's to disable advancement locking for, e.g. [ "botania:lexicon" ]. Config Flags: advancements_disabled_ +noAdvancementBooks = [] +#Enable testing mode. By default this doesn't do anything, but you can use the config flag in your books if you want. Config Flag: testing_mode +testingMode = false +#Set this to the ID of a book to have it show up in players' inventories, replacing the recipe book. +inventoryButtonBook = "" +#Set this to true to use Shift instead of Ctrl for the inventory quick lookup feature. +useShiftForQuickLookup = false +#Set how text overflow should be coped with: overflow the text off the page, truncate overflowed text, or resize everything to fit. Relogin after changing. +#Allowed Values: OVERFLOW, TRUNCATE, RESIZE +textOverflowMode = "RESIZE" + diff --git a/curseforge/overrides/config/rftoolscontrol-client.toml b/client/overrides/config/pipez-client.toml similarity index 100% rename from curseforge/overrides/config/rftoolscontrol-client.toml rename to client/overrides/config/pipez-client.toml diff --git a/curseforge/overrides/config/pneumaticcraft-client.toml b/client/overrides/config/pneumaticcraft-client.toml similarity index 100% rename from curseforge/overrides/config/pneumaticcraft-client.toml rename to client/overrides/config/pneumaticcraft-client.toml diff --git a/curseforge/overrides/config/pneumaticcraft-common.toml b/client/overrides/config/pneumaticcraft-common.toml similarity index 100% rename from curseforge/overrides/config/pneumaticcraft-common.toml rename to client/overrides/config/pneumaticcraft-common.toml diff --git a/curseforge/overrides/config/pneumaticcraft/ArmorFeatureStatus.cfg b/client/overrides/config/pneumaticcraft/ArmorFeatureStatus.cfg similarity index 100% rename from curseforge/overrides/config/pneumaticcraft/ArmorFeatureStatus.cfg rename to client/overrides/config/pneumaticcraft/ArmorFeatureStatus.cfg diff --git a/curseforge/overrides/config/pneumaticcraft/MicromissileDefaults.cfg b/client/overrides/config/pneumaticcraft/MicromissileDefaults.cfg similarity index 100% rename from curseforge/overrides/config/pneumaticcraft/MicromissileDefaults.cfg rename to client/overrides/config/pneumaticcraft/MicromissileDefaults.cfg diff --git a/curseforge/overrides/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg b/client/overrides/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg similarity index 100% rename from curseforge/overrides/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg rename to client/overrides/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg diff --git a/curseforge/overrides/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg b/client/overrides/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg similarity index 100% rename from curseforge/overrides/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg rename to client/overrides/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg diff --git a/curseforge/overrides/config/pneumaticcraft/thirdparty.cfg b/client/overrides/config/pneumaticcraft/thirdparty.cfg similarity index 100% rename from curseforge/overrides/config/pneumaticcraft/thirdparty.cfg rename to client/overrides/config/pneumaticcraft/thirdparty.cfg diff --git a/curseforge/overrides/config/productivebees-client.toml b/client/overrides/config/productivebees-client.toml similarity index 100% rename from curseforge/overrides/config/productivebees-client.toml rename to client/overrides/config/productivebees-client.toml diff --git a/curseforge/overrides/config/quark-common.toml b/client/overrides/config/quark-common.toml similarity index 96% rename from curseforge/overrides/config/quark-common.toml rename to client/overrides/config/quark-common.toml index 6993a50..bf5673f 100644 --- a/curseforge/overrides/config/quark-common.toml +++ b/client/overrides/config/quark-common.toml @@ -369,25 +369,13 @@ "Cloud Level Top" = 196 [tools.ancient_tomes] - #Set to 0 to not generate in Dungeons - "Dungeon Weight" = 20 - #Set to 0 to not generate in Stronghold Libraries - "Library Weight" = 30 - #Set to 0 to not generate in Bastions - "Bastion Weight" = 25 - #Set to 0 to not generate in Woodland Mansions - "Woodland Mansion Weight" = 15 - #Set to 0 to not generate in Nether Fortresses - "Nether Fortress Weight" = 0 - #Set to 0 to not generate in Underwater Ruins - "Underwater Ruin Weight" = 0 - #Set to 0 to not generate in Monster Boxes - "Monster Box Weight" = 5 "Item Quality" = 2 "Normal Upgrade Cost" = 10 "Limit Break Upgrade Cost" = 30 "Valid Enchantments" = ["minecraft:feather_falling", "minecraft:thorns", "minecraft:sharpness", "minecraft:smite", "minecraft:bane_of_arthropods", "minecraft:knockback", "minecraft:fire_aspect", "minecraft:looting", "minecraft:sweeping", "minecraft:efficiency", "minecraft:unbreaking", "minecraft:fortune", "minecraft:power", "minecraft:punch", "minecraft:luck_of_the_sea", "minecraft:lure", "minecraft:loyalty", "minecraft:riptide", "minecraft:impaling", "minecraft:piercing"] "Overleveled Books Glow Rainbow" = true + #Format is lootTable,weight. i.e. "minecraft:chests/stronghold_library,30" + "Loot Tables" = ["minecraft:chests/stronghold_library,30", "minecraft:chests/simple_dungeon,20", "minecraft:chests/bastion_treasure,25", "minecraft:chests/woodland_mansion,15", "minecraft:chests/nether_bridge,0", "minecraft:chests/underwater_ruin_big,0", "minecraft:chests/underwater_ruin_small,0", "quark:misc/monster_box,5"] [tweaks] "Lock Rotation" = true @@ -1527,7 +1515,6 @@ "Zombie Villagers On Normal" = false "Game Nerfs" = false "Enchantments Begone" = false - "Empty NBT Begone" = false [experimental.overlay_shader] #Sets the name of the shader to load on a regular basis. This can load any shader the Camera module can (and requires the Camera module enabled to apply said logic). @@ -1616,6 +1603,7 @@ #A list of enchantment IDs you don't want the enchantment table to be able to create "Disallowed Enchantments" = [] #An array of influences each candle should apply. This list must be 16 elements long, and is in order of wool colors. + #A minus sign before an enchantment will make the influence decrease the probability of that enchantment. "Influences List" = ["minecraft:unbreaking", "minecraft:fire_protection", "minecraft:knockback,minecraft:punch", "minecraft:feather_falling", "minecraft:looting,minecraft:fortune,minecraft:luck_of_the_sea", "minecraft:blast_protection", "minecraft:silk_touch,minecraft:channeling", "minecraft:bane_of_arthropods", "minecraft:protection", "minecraft:respiration,minecraft:loyalty,minecraft:infinity", "minecraft:sweeping,minecraft:multishot", "minecraft:efficiency,minecraft:sharpness,minecraft:lure,minecraft:power,minecraft:impaling,minecraft:quick_charge", "minecraft:aqua_affinity,minecraft:depth_strider,minecraft:riptide", "minecraft:thorns,minecraft:piercing", "minecraft:fire_aspect,minecraft:flame", "minecraft:smite,minecraft:projectile_protection"] #Set to false to disable the ability to influence enchantment outcomes with candles "Allow Influencing" = true @@ -1625,6 +1613,9 @@ "Influence Power" = 0.125 #If you set this to false, the vanilla Enchanting Table will no longer automatically convert to the Matrix Enchanting table. You'll have to add a recipe for the Matrix Enchanting Table to make use of this. "Automatically Convert" = true + #An array of influences that other blocks should apply. + #Format is: "blockstate;strength;color;enchantments", i.e. "minecraft:sea_pickle[pickles=1,waterlogged=false];1;#008000;minecraft:aqua_affinity,minecraft:depth_strider,minecraft:riptide" (etc) or "minecraft:anvil[facing=north];#808080;-minecraft:thorns,minecraft:unbreaking" (etc) + "States To Influences" = [] [oddities.magnets] #Any items you place in this list will be derived so that any block made of it will become magnetizable diff --git a/curseforge/overrides/config/rftoolsbase-common.toml b/client/overrides/config/rftoolsbase-common.toml similarity index 100% rename from curseforge/overrides/config/rftoolsbase-common.toml rename to client/overrides/config/rftoolsbase-common.toml diff --git a/curseforge/overrides/config/rftoolsbuilder-client.toml b/client/overrides/config/rftoolsbuilder-client.toml similarity index 100% rename from curseforge/overrides/config/rftoolsbuilder-client.toml rename to client/overrides/config/rftoolsbuilder-client.toml diff --git a/curseforge/overrides/config/rftoolspower-client.toml b/client/overrides/config/rftoolscontrol-client.toml similarity index 100% rename from curseforge/overrides/config/rftoolspower-client.toml rename to client/overrides/config/rftoolscontrol-client.toml diff --git a/client/overrides/config/rftoolspower-client.toml b/client/overrides/config/rftoolspower-client.toml new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/client/overrides/config/rftoolspower-client.toml @@ -0,0 +1 @@ + diff --git a/curseforge/overrides/config/rftoolsutility-client.toml b/client/overrides/config/rftoolsutility-client.toml similarity index 100% rename from curseforge/overrides/config/rftoolsutility-client.toml rename to client/overrides/config/rftoolsutility-client.toml diff --git a/curseforge/overrides/config/rubidium-mixins.properties b/client/overrides/config/rubidium-mixins.properties similarity index 100% rename from curseforge/overrides/config/rubidium-mixins.properties rename to client/overrides/config/rubidium-mixins.properties diff --git a/curseforge/overrides/config/shetiphiancore-client.toml b/client/overrides/config/shetiphiancore-client.toml similarity index 100% rename from curseforge/overrides/config/shetiphiancore-client.toml rename to client/overrides/config/shetiphiancore-client.toml diff --git a/curseforge/overrides/config/shetiphiancore.toml b/client/overrides/config/shetiphiancore.toml similarity index 100% rename from curseforge/overrides/config/shetiphiancore.toml rename to client/overrides/config/shetiphiancore.toml diff --git a/curseforge/overrides/config/sidebar_buttons.json b/client/overrides/config/sidebar_buttons.json similarity index 100% rename from curseforge/overrides/config/sidebar_buttons.json rename to client/overrides/config/sidebar_buttons.json diff --git a/curseforge/overrides/config/simplebackups-common.toml b/client/overrides/config/simplebackups-common.toml similarity index 100% rename from curseforge/overrides/config/simplebackups-common.toml rename to client/overrides/config/simplebackups-common.toml diff --git a/curseforge/overrides/config/simpletomb.toml b/client/overrides/config/simpletomb.toml similarity index 100% rename from curseforge/overrides/config/simpletomb.toml rename to client/overrides/config/simpletomb.toml diff --git a/curseforge/overrides/config/sodium-options.json b/client/overrides/config/sodium-options.json similarity index 100% rename from curseforge/overrides/config/sodium-options.json rename to client/overrides/config/sodium-options.json diff --git a/curseforge/overrides/config/sophisticatedbackpacks-common.toml b/client/overrides/config/sophisticatedbackpacks-common.toml similarity index 100% rename from curseforge/overrides/config/sophisticatedbackpacks-common.toml rename to client/overrides/config/sophisticatedbackpacks-common.toml diff --git a/curseforge/overrides/config/sophisticatedcore-client.toml b/client/overrides/config/sophisticatedcore-client.toml similarity index 100% rename from curseforge/overrides/config/sophisticatedcore-client.toml rename to client/overrides/config/sophisticatedcore-client.toml diff --git a/curseforge/overrides/config/sophisticatedcore-common.toml b/client/overrides/config/sophisticatedcore-common.toml similarity index 100% rename from curseforge/overrides/config/sophisticatedcore-common.toml rename to client/overrides/config/sophisticatedcore-common.toml diff --git a/curseforge/overrides/config/steampowered-common.toml b/client/overrides/config/steampowered-common.toml similarity index 100% rename from curseforge/overrides/config/steampowered-common.toml rename to client/overrides/config/steampowered-common.toml diff --git a/curseforge/overrides/config/storagedrawers-client.toml b/client/overrides/config/storagedrawers-client.toml similarity index 100% rename from curseforge/overrides/config/storagedrawers-client.toml rename to client/overrides/config/storagedrawers-client.toml diff --git a/curseforge/overrides/config/storagedrawers-common.toml b/client/overrides/config/storagedrawers-common.toml similarity index 100% rename from curseforge/overrides/config/storagedrawers-common.toml rename to client/overrides/config/storagedrawers-common.toml diff --git a/curseforge/overrides/config/tcintegrations-common.toml b/client/overrides/config/tcintegrations-common.toml similarity index 100% rename from curseforge/overrides/config/tcintegrations-common.toml rename to client/overrides/config/tcintegrations-common.toml diff --git a/curseforge/overrides/config/tconstruct-client.toml b/client/overrides/config/tconstruct-client.toml similarity index 100% rename from curseforge/overrides/config/tconstruct-client.toml rename to client/overrides/config/tconstruct-client.toml diff --git a/curseforge/overrides/config/tconstruct-common.toml b/client/overrides/config/tconstruct-common.toml similarity index 100% rename from curseforge/overrides/config/tconstruct-common.toml rename to client/overrides/config/tconstruct-common.toml diff --git a/curseforge/overrides/config/terrablender.toml b/client/overrides/config/terrablender.toml similarity index 100% rename from curseforge/overrides/config/terrablender.toml rename to client/overrides/config/terrablender.toml diff --git a/curseforge/overrides/config/thermal-client.toml b/client/overrides/config/thermal-client.toml similarity index 100% rename from curseforge/overrides/config/thermal-client.toml rename to client/overrides/config/thermal-client.toml diff --git a/curseforge/overrides/config/thermal-common.toml b/client/overrides/config/thermal-common.toml similarity index 61% rename from curseforge/overrides/config/thermal-common.toml rename to client/overrides/config/thermal-common.toml index 318c2e5..9937fdf 100644 --- a/curseforge/overrides/config/thermal-common.toml +++ b/client/overrides/config/thermal-common.toml @@ -5,113 +5,127 @@ [World.Ores."Oil Sand"] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 2 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 24 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = 40 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 80 [World.Ores.Silver] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 4 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 8 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -60 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 40 [World.Ores.Lead] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 6 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 8 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -60 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 40 [World.Ores.Nickel] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 4 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 8 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -40 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 120 [World.Ores.Cinnabar] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 1 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 5 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -16 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 48 [World.Ores.Sulfur] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 2 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 7 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -16 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 32 [World.Ores.Tin] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 6 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 9 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -20 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 60 [World.Ores.Niter] #Max number of veins per chunk; set to 0 to disable. - #Range: 0 ~ 256 + #Range: 0 ~ 64 "Vein Count" = 2 #Max size of the vein. - #Range: 1 ~ 256 + #Range: 1 ~ 64 "Vein Size" = 7 #Minimum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Min Y" = -16 #Maximum Y spawn. - #Range: -2048 ~ 2048 + #Range: -2032 ~ 2031 "Max Y" = 64 + [World.Ores.Apatite] + #Max number of veins per chunk; set to 0 to disable. + #Range: 0 ~ 64 + "Vein Count" = 4 + #Max size of the vein. + #Range: 1 ~ 64 + "Vein Size" = 9 + #Minimum Y spawn. + #Range: -2032 ~ 2031 + "Min Y" = -16 + #Maximum Y spawn. + #Range: -2032 ~ 2031 + "Max Y" = 96 + diff --git a/curseforge/overrides/config/twigs-common.toml b/client/overrides/config/twigs-common.toml similarity index 100% rename from curseforge/overrides/config/twigs-common.toml rename to client/overrides/config/twigs-common.toml diff --git a/curseforge/overrides/config/waila/blacklist.json b/client/overrides/config/waila/blacklist.json similarity index 100% rename from curseforge/overrides/config/waila/blacklist.json rename to client/overrides/config/waila/blacklist.json diff --git a/curseforge/overrides/config/waila/waila.json b/client/overrides/config/waila/waila.json similarity index 100% rename from curseforge/overrides/config/waila/waila.json rename to client/overrides/config/waila/waila.json diff --git a/curseforge/overrides/config/waila/waila_plugins.json b/client/overrides/config/waila/waila_plugins.json similarity index 100% rename from curseforge/overrides/config/waila/waila_plugins.json rename to client/overrides/config/waila/waila_plugins.json diff --git a/curseforge/overrides/config/waystones-common.toml b/client/overrides/config/waystones-common.toml similarity index 100% rename from curseforge/overrides/config/waystones-common.toml rename to client/overrides/config/waystones-common.toml diff --git a/curseforge/overrides/resourcepacks/Copper Legacy Pack.zip b/client/overrides/resourcepacks/Copper Legacy Pack.zip similarity index 100% rename from curseforge/overrides/resourcepacks/Copper Legacy Pack.zip rename to client/overrides/resourcepacks/Copper Legacy Pack.zip diff --git a/curseforge/overrides/resourcepacks/Quark Programmer Art.zip b/client/overrides/resourcepacks/Quark Programmer Art.zip similarity index 100% rename from curseforge/overrides/resourcepacks/Quark Programmer Art.zip rename to client/overrides/resourcepacks/Quark Programmer Art.zip diff --git a/curseforge/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini b/curseforge/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini deleted file mode 100644 index c2470b7..0000000 --- a/curseforge/overrides/config/jei/world/server/my_server_b137ab07/bookmarks.ini +++ /dev/null @@ -1 +0,0 @@ -T:{Count:1b,id:"minecraft:oak_log"}