diff --git a/config/Advancedperipherals/general.toml b/config/Advancedperipherals/general.toml new file mode 100644 index 0000000..31252c8 --- /dev/null +++ b/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/config/Advancedperipherals/metaphysics.toml b/config/Advancedperipherals/metaphysics.toml new file mode 100644 index 0000000..fef8a31 --- /dev/null +++ b/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/config/Advancedperipherals/peripherals.toml b/config/Advancedperipherals/peripherals.toml new file mode 100644 index 0000000..b7c4b28 --- /dev/null +++ b/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/config/Advancedperipherals/world.toml b/config/Advancedperipherals/world.toml new file mode 100644 index 0000000..ba4a786 --- /dev/null +++ b/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/config/additional-additions-config.json b/config/additional-additions-config.json index 4ae755b..b3c7b0d 100644 --- a/config/additional-additions-config.json +++ b/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/config/cfm-common.toml b/config/cfm-common.toml new file mode 100644 index 0000000..6c6490e --- /dev/null +++ b/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/config/createaddition-common.toml b/config/createaddition-common.toml index 763b874..0c21f95 100644 --- a/config/createaddition-common.toml +++ b/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/config/cucumber-tags.json b/config/cucumber-tags.json index d95f193..dd3fb2d 100644 --- a/config/cucumber-tags.json +++ b/config/cucumber-tags.json @@ -20,7 +20,7 @@ "forge:ingots/silver": "immersiveengineering:ingot_silver", "forge:dusts/saltpeter": "immersiveengineering:dust_saltpeter", "forge:ingots/steel": "beyond_earth:steel_ingot", - "forge:ingots/titanium": "null", + "forge:ingots/titanium": "electrodynamics:ingottitanium", "forge:rubber": "null", "forge:ingots/platinum": "null", "forge:dusts/sulfur": "mekanism:dust_sulfur", diff --git a/config/ironjetpacks-common.toml b/config/ironjetpacks-common.toml index f3b69ed..e82e2f4 100644 --- a/config/ironjetpacks-common.toml +++ b/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/config/ironjetpacks/jetpacks/bronze.json b/config/ironjetpacks/jetpacks/bronze.json index c04d0d0..09fb387 100644 --- a/config/ironjetpacks/jetpacks/bronze.json +++ b/config/ironjetpacks/jetpacks/bronze.json @@ -20,5 +20,6 @@ "speedHover": 0.075, "sprintSpeedMulti": 1.1, "sprintSpeedMultiVertical": 1.05, - "sprintFuelMulti": 2.1 + "sprintFuelMulti": 2.1, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/copper.json b/config/ironjetpacks/jetpacks/copper.json index 098beed..5fe781c 100644 --- a/config/ironjetpacks/jetpacks/copper.json +++ b/config/ironjetpacks/jetpacks/copper.json @@ -20,5 +20,6 @@ "speedHover": 0.092, "sprintSpeedMulti": 1.05, "sprintSpeedMultiVertical": 1.025, - "sprintFuelMulti": 1.4 + "sprintFuelMulti": 1.4, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/creative.json b/config/ironjetpacks/jetpacks/creative.json index 1d9eedd..b6a0586 100644 --- a/config/ironjetpacks/jetpacks/creative.json +++ b/config/ironjetpacks/jetpacks/creative.json @@ -20,5 +20,6 @@ "speedHover": 0.0, "sprintSpeedMulti": 2.0, "sprintSpeedMultiVertical": 1.5, - "sprintFuelMulti": 0.0 + "sprintFuelMulti": 0.0, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/diamond.json b/config/ironjetpacks/jetpacks/diamond.json index 495f345..8af93a8 100644 --- a/config/ironjetpacks/jetpacks/diamond.json +++ b/config/ironjetpacks/jetpacks/diamond.json @@ -20,5 +20,6 @@ "speedHover": 0.005, "sprintSpeedMulti": 1.8, "sprintSpeedMultiVertical": 1.4, - "sprintFuelMulti": 3.8 + "sprintFuelMulti": 3.8, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/electrum.json b/config/ironjetpacks/jetpacks/electrum.json index 8295255..8e63a1c 100644 --- a/config/ironjetpacks/jetpacks/electrum.json +++ b/config/ironjetpacks/jetpacks/electrum.json @@ -20,5 +20,6 @@ "speedHover": 0.03, "sprintSpeedMulti": 1.6, "sprintSpeedMultiVertical": 1.3, - "sprintFuelMulti": 3.5 + "sprintFuelMulti": 3.5, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/emerald.json b/config/ironjetpacks/jetpacks/emerald.json index fee1821..bdaf0e3 100644 --- a/config/ironjetpacks/jetpacks/emerald.json +++ b/config/ironjetpacks/jetpacks/emerald.json @@ -20,5 +20,6 @@ "speedHover": 0.0, "sprintSpeedMulti": 2.0, "sprintSpeedMultiVertical": 1.5, - "sprintFuelMulti": 4.0 + "sprintFuelMulti": 4.0, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/gold.json b/config/ironjetpacks/jetpacks/gold.json index e889d9d..f87f3b1 100644 --- a/config/ironjetpacks/jetpacks/gold.json +++ b/config/ironjetpacks/jetpacks/gold.json @@ -20,5 +20,6 @@ "speedHover": 0.03, "sprintSpeedMulti": 1.5, "sprintSpeedMultiVertical": 1.25, - "sprintFuelMulti": 3.2 + "sprintFuelMulti": 3.2, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/invar.json b/config/ironjetpacks/jetpacks/invar.json index df780ec..4e455c8 100644 --- a/config/ironjetpacks/jetpacks/invar.json +++ b/config/ironjetpacks/jetpacks/invar.json @@ -20,5 +20,6 @@ "speedHover": 0.03, "sprintSpeedMulti": 1.5, "sprintSpeedMultiVertical": 1.25, - "sprintFuelMulti": 3.2 + "sprintFuelMulti": 3.2, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/iron.json b/config/ironjetpacks/jetpacks/iron.json index 710d517..803784b 100644 --- a/config/ironjetpacks/jetpacks/iron.json +++ b/config/ironjetpacks/jetpacks/iron.json @@ -20,5 +20,6 @@ "speedHover": 0.075, "sprintSpeedMulti": 1.1, "sprintSpeedMultiVertical": 1.05, - "sprintFuelMulti": 2.1 + "sprintFuelMulti": 2.1, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/platinum.json b/config/ironjetpacks/jetpacks/platinum.json index 455899a..8aad871 100644 --- a/config/ironjetpacks/jetpacks/platinum.json +++ b/config/ironjetpacks/jetpacks/platinum.json @@ -20,5 +20,6 @@ "speedHover": 0.005, "sprintSpeedMulti": 1.8, "sprintSpeedMultiVertical": 1.4, - "sprintFuelMulti": 3.8 + "sprintFuelMulti": 3.8, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/silver.json b/config/ironjetpacks/jetpacks/silver.json index ac15208..8f3fbef 100644 --- a/config/ironjetpacks/jetpacks/silver.json +++ b/config/ironjetpacks/jetpacks/silver.json @@ -20,5 +20,6 @@ "speedHover": 0.07, "sprintSpeedMulti": 1.3, "sprintSpeedMultiVertical": 1.15, - "sprintFuelMulti": 2.7 + "sprintFuelMulti": 2.7, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/steel.json b/config/ironjetpacks/jetpacks/steel.json index 827684d..e9f7313 100644 --- a/config/ironjetpacks/jetpacks/steel.json +++ b/config/ironjetpacks/jetpacks/steel.json @@ -20,5 +20,6 @@ "speedHover": 0.025, "sprintSpeedMulti": 1.5, "sprintSpeedMultiVertical": 1.25, - "sprintFuelMulti": 3.2 + "sprintFuelMulti": 3.2, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/stone.json b/config/ironjetpacks/jetpacks/stone.json index 2c54283..b7c5f31 100644 --- a/config/ironjetpacks/jetpacks/stone.json +++ b/config/ironjetpacks/jetpacks/stone.json @@ -20,5 +20,6 @@ "speedHover": 0.1, "sprintSpeedMulti": 1.0, "sprintSpeedMultiVertical": 1.0, - "sprintFuelMulti": 1.0 + "sprintFuelMulti": 1.0, + "curios": true } \ No newline at end of file diff --git a/config/ironjetpacks/jetpacks/wood.json b/config/ironjetpacks/jetpacks/wood.json index eac6ef1..e26c0bf 100644 --- a/config/ironjetpacks/jetpacks/wood.json +++ b/config/ironjetpacks/jetpacks/wood.json @@ -20,5 +20,6 @@ "speedHover": 0.14, "sprintSpeedMulti": 1.0, "sprintSpeedMultiVertical": 1.0, - "sprintFuelMulti": 1.0 + "sprintFuelMulti": 1.0, + "curios": true } \ No newline at end of file diff --git a/config/quark-common.toml b/config/quark-common.toml index 17f8b27..379715f 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -358,25 +358,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"] [tools.ambient_discs] "Drop On Spider Kill" = true @@ -1526,7 +1514,6 @@ "Narrator Readout" = false "Game Nerfs" = false "Enchantments Begone" = false - "Empty NBT Begone" = false "Adjustable Chat" = false [experimental.spawner_replacer] @@ -1633,6 +1620,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 @@ -1642,6 +1630,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/config/thermal-common.toml b/config/thermal-common.toml index 817a469..ccd79fd 100644 --- a/config/thermal-common.toml +++ b/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/config/worldedit/worldedit.properties b/config/worldedit/worldedit.properties index d4f6154..8db0438 100644 --- a/config/worldedit/worldedit.properties +++ b/config/worldedit/worldedit.properties @@ -1,5 +1,5 @@ #Don't put comments; they get removed -#Tue May 17 16:57:35 CDT 2022 +#Wed May 25 13:22:59 CDT 2022 max-super-pickaxe-size=5 use-inventory-creative-override=false use-inventory-override=false diff --git a/defaultconfigs/electrodynamics.txt b/defaultconfigs/electrodynamics.txt new file mode 100644 index 0000000..4c07be6 --- /dev/null +++ b/defaultconfigs/electrodynamics.txt @@ -0,0 +1,61 @@ +F:default=0.9925 -> TRANSFORMER_EFFICIENCY='0.9925' +F:default=0.995 -> CIRCUITBREAKER_EFFICIENCY='0.995' +D:default=34.0 -> COALGENERATOR_AMPERAGE='34.0' +D:default=4.5 -> THERMOELECTRICGENERATOR_AMPERAGE='4.5' +D:default=6.0 -> HYDROELECTRICGENERATOR_AMPERAGE='6.0' +D:default=10.0 -> WINDMILL_MAX_AMPERAGE='10.0' +D:default=7.0 -> SOLARPANEL_AMPERAGE='7.0' +D:default=50.0 -> ELECTRICPUMP_USAGE_PER_TICK='50.0' +D:default=25.0 -> ADVANCEDSOLARPANEL_AMPERAGE='25.0' +D:default=175.0 -> ELECTRICFURNACE_USAGE_PER_TICK='175.0' +I:default=100 -> ELECTRICFURNACE_REQUIRED_TICKS='100' +D:default=175.0 -> ELECTRICARCFURNACE_USAGE_PER_TICK='175.0' +I:default=50 -> ELECTRICARCFURNACE_REQUIRED_TICKS='50' +D:default=125.0 -> WIREMILL_USAGE_PER_TICK='125.0' +I:default=200 -> WIREMILL_REQUIRED_TICKS='200' +D:default=350.0 -> MINERALGRINDER_USAGE_PER_TICK='350.0' +I:default=200 -> MINERALGRINDER_REQUIRED_TICKS='200' +D:default=450.0 -> MINERALCRUSHER_USAGE_PER_TICK='450.0' +I:default=200 -> MINERALCRUSHER_REQUIRED_TICKS='200' +D:default=400.0 -> MINERALWASHER_USAGE_PER_TICK='400.0' +I:default=200 -> MINERALWASHER_REQUIRED_TICKS='200' +D:default=400.0 -> CHEMICALMIXER_USAGE_PER_TICK='400.0' +I:default=200 -> CHEMICALMIXER_REQUIRED_TICKS='200' +D:default=350.0 -> OXIDATIONFURNACE_USAGE_PER_TICK='350.0' +I:default=200 -> OXIDATIONFURNACE_REQUIRED_TICKS='200' +D:default=10.0 -> FERMENTATIONPLANT_USAGE_PER_TICK='20.0' +I:default=2000 -> FERMENTATIONPLANT_REQUIRED_TICKS='2000' +D:default=350.0 -> COMBUSTIONCHAMBER_JOULES_PER_TICK='350.0' +D:default=800.0 -> CHEMICALCRYSTALLIZER_USAGE_PER_TICK='800.0' +I:default=200 -> CHEMICALCRYSTALLIZER_REQUIRED_TICKS='200' +I:default=50 -> ENERGIZEDALLOYER_REQUIRED_TICKS='50' +D:default=50.0 -> ENERGIZEDALLOYER_USAGE_PER_TICK='50.0' +I:default=200 -> LATHE_REQUIRED_TICKS='200' +D:default=350.0 -> LATHE_USAGE_PER_TICK='350.0' +I:default=50 -> REINFORCEDALLOYER_REQUIRED_TICKS='50' +D:default=50.0 -> REINFORCEDALLOYER_USAGE_PER_TICK='50.0' +I:default=10 -> CHARGER_REQUIRED_TICKS='100' +D:default=1000.0 -> CHARGER_USAGER_PER_TICK='1000.0' +I:default=100 -> COBBLE_GEN_REQUIRED_TICKS='100' +D:default=100.0 -> COBBLE_GEN_USAGE_PER_TICK='100.0' +I:default=200 -> ELECTROLYTICSEPARATOR_REQUIRED_TICKS='200' +D:default=100.0 -> ELECTROLYTICSEPARATOR_USAGE_PER_TICK='250.0' +D:default=100.0 -> MOTORCOMPLEX_USAGE_PER_TICK='100.0' +D:default=100.0 -> QUARRY_USAGE_PER_TICK='100.0' +I:default=10 -> QUARRY_WATERUSAGE_PER_BLOCK='10' +Comment: 'max radius = 128, min radius = 2' +I:default=64 -> MARKER_RADIUS='64' +Comment: 'max possible is 1 tick / block' +I:default=1 -> MAX_QUARRYBLOCKS_PER_TICK='1' +Comment: 'min possible speed is 100 ticks / block' +I:default=100 -> MIN_QUARRYBLOCKS_PER_TICK='100' +Comment: 'how many air blocks the quarry can skip over in one clearing tick; max is 128, min is zero' +I:default=64 -> CLEARING_AIR_SKIP='64' +Comment: 'how many air blocks the quarry can skip over in one mining tick; max is 128, min is zero' +I:default=64 -> MINING_AIR_SKIP='64' +Comment: 'controls whether or not the quarry will mine blocks that have been placed into the mining area' +T:default=true -> MAINTAIN_MINING_AREA='true' +Comment: 'Controls whether the quarry can bypass claims or not' +T:default=false -> BYPASS_CLAIMS='false' +T:default=true -> DISPENSE_GUIDEBOOK='true' + diff --git a/defaultconfigs/electrodynamics_ore_config.txt b/defaultconfigs/electrodynamics_ore_config.txt new file mode 100644 index 0000000..bdff541 --- /dev/null +++ b/defaultconfigs/electrodynamics_ore_config.txt @@ -0,0 +1,2 @@ +S:default=tin:silver:lead:uraninite:thorianite:monazite:vanadinite:sulfur:niter:aluminum:chromite:rutile:halite:lepidolite:molybdenum:fluorite:sylvite -> oresToSpawn='tin:silver:lead:uraninite:thorianite:monazite:vanadinite:sulfur:niter:aluminum:chromite:rutile:halite:lepidolite:molybdenum:fluorite:sylvite' +D:default=1.0 -> OREGENERATIONMULTIPLIER='1.0' diff --git a/forge-1.18.2-40.1.25-installer.jar b/forge-1.18.2-40.1.25-installer.jar new file mode 100644 index 0000000..260883a Binary files /dev/null and b/forge-1.18.2-40.1.25-installer.jar differ diff --git a/mods/ftb-ranks-forge-1605.1.6-build.33.jar b/mods/ftb-ranks-forge-1605.1.6-build.33.jar deleted file mode 100644 index b4ad0c4..0000000 Binary files a/mods/ftb-ranks-forge-1605.1.6-build.33.jar and /dev/null differ diff --git a/run.bat b/run.bat index aa53863..347eb86 100644 --- a/run.bat +++ b/run.bat @@ -1,6 +1,6 @@ -REM Forge requires a configured set of both JVM and program arguments. -REM Add custom JVM arguments to the user_jvm_args.txt -REM Add custom program arguments {such as nogui} to this file in the next line before the %* or -REM pass them to this script directly -java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.18.2-40.1.19/win_args.txt %* -pause +REM Forge requires a configured set of both JVM and program arguments. +REM Add custom JVM arguments to the user_jvm_args.txt +REM Add custom program arguments {such as nogui} to this file in the next line before the %* or +REM pass them to this script directly +java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.18.2-40.1.25/win_args.txt %* +pause diff --git a/run.sh b/run.sh index 1fa2dbf..cd5ac60 100755 --- a/run.sh +++ b/run.sh @@ -3,4 +3,4 @@ # Add custom JVM arguments to the user_jvm_args.txt # Add custom program arguments {such as nogui} to this file in the next line before the "$@" or # pass them to this script directly -java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.18.2-40.1.19/unix_args.txt "$@" +java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.18.2-40.1.25/unix_args.txt "$@" diff --git a/server.properties b/server.properties index a2613cf..dcc1931 100644 --- a/server.properties +++ b/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sun May 15 04:26:33 CDT 2022 +#Wed May 25 13:21:54 CDT 2022 allow-flight=true allow-nether=true broadcast-console-to-ops=true diff --git a/world/serverconfig/forge-server.toml b/world/serverconfig/forge-server.toml index 3cf2766..8579528 100644 --- a/world/serverconfig/forge-server.toml +++ b/world/serverconfig/forge-server.toml @@ -19,4 +19,6 @@ fixAdvancementLoading = true #The permission handler used by the server. Defaults to forge:default_handler if no such handler with that name is registered. permissionHandler = "forge:default_handler" + #Set this to true to remove any Entity (Note: Does not include BlockEntities) that throws an error in its tick method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES. + removeErroringEntities = false diff --git a/world/serverconfig/ftbchunks.snbt b/world/serverconfig/ftbchunks.snbt index 85f8615..2a56ff1 100644 --- a/world/serverconfig/ftbchunks.snbt +++ b/world/serverconfig/ftbchunks.snbt @@ -10,7 +10,10 @@ # Blacklist for dimensions where chunks can't be claimed. Add "minecraft:the_end" to this list if you want to disable chunk claiming in The End # Default: [] - claim_dimension_blacklist: [minecraft:the_end] + claim_dimension_blacklist: [ + "minecraft" + ":the_end" + ] # Disables all land protection. Useful for private servers where everyone is trusted and claims are only used for forceloading # Default: false diff --git a/world/serverconfig/pipez-server.toml b/world/serverconfig/pipez-server.toml new file mode 100644 index 0000000..c7491ab --- /dev/null +++ b/world/serverconfig/pipez-server.toml @@ -0,0 +1,104 @@ + +[item_pipe] + + [item_pipe.speed] + #The speed at which items are transferred + #A value of 1 means every tick + #Range: > 1 + no_upgrade = 20 + #The speed at which items are transferred + #A value of 1 means every tick + #Range: > 1 + basic = 15 + #The speed at which items are transferred + #A value of 1 means every tick + #Range: > 1 + improved = 10 + #The speed at which items are transferred + #A value of 1 means every tick + #Range: > 1 + advanced = 5 + #The speed at which items are transferred + #A value of 1 means every tick + #Range: > 1 + ultimate = 1 + + [item_pipe.amount] + #The amount of items transferred + #Range: > 1 + no_upgrade = 4 + #The amount of items transferred + #Range: > 1 + basic = 8 + #The amount of items transferred + #Range: > 1 + improved = 16 + #The amount of items transferred + #Range: > 1 + advanced = 32 + #The amount of items transferred + #Range: > 1 + ultimate = 64 + +[fluid_pipe] + + [fluid_pipe.amount] + #The amount of mB transferred each tick + #Range: > 1 + no_upgrade = 50 + #The amount of mB transferred each tick + #Range: > 1 + basic = 100 + #The amount of mB transferred each tick + #Range: > 1 + improved = 500 + #The amount of mB transferred each tick + #Range: > 1 + advanced = 2000 + #The amount of mB transferred each tick + #Range: > 1 + ultimate = 10000 + +[energy_pipe] + + [energy_pipe.amount] + #The amount of FE transferred each tick + #Range: > 1 + no_upgrade = 256 + #The amount of FE transferred each tick + #Range: > 1 + basic = 1024 + #The amount of FE transferred each tick + #Range: > 1 + improved = 8192 + #The amount of FE transferred each tick + #Range: > 1 + advanced = 32768 + #The amount of FE transferred each tick + #Range: > 1 + ultimate = 131072 + +[gas_pipe] + + [gas_pipe.amount] + #The amount of mB transferred each tick + #Only available if Mekanism is installed + #Range: > 1 + no_upgrade = 200 + #The amount of mB transferred each tick + #Only available if Mekanism is installed + #Range: > 1 + basic = 400 + #The amount of mB transferred each tick + #Only available if Mekanism is installed + #Range: > 1 + improved = 2000 + #The amount of mB transferred each tick + #Only available if Mekanism is installed + #Range: > 1 + advanced = 8000 + #The amount of mB transferred each tick + #Only available if Mekanism is installed + #Range: > 1 + ultimate = 40000 + diff --git a/world/serverconfig/thermal-server.toml b/world/serverconfig/thermal-server.toml index 31f2823..64289c5 100644 --- a/world/serverconfig/thermal-server.toml +++ b/world/serverconfig/thermal-server.toml @@ -83,3 +83,128 @@ #Range: 20 ~ 72000 "Time Constant" = 500 + [Devices.Fisher] + #This sets the base time constant (in ticks) for the Aquatic Entangler. + #Range: 400 ~ 72000 + "Time Constant" = 4800 + #This sets the time constant reduction (in ticks) per nearby Water source block for the Aquatic Entangler. + #Range: 1 ~ 1000 + "Water Source Time Constant Reduction" = 20 + +[Dynamos] + + [Dynamos.Stirling] + #This sets the base power generation (RF/t) for the Stirling Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Compression] + #This sets the base power generation (RF/t) for the Compression Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Magmatic] + #This sets the base power generation (RF/t) for the Magmatic Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Numismatic] + #This sets the base power generation (RF/t) for the Numismatic Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Lapidary] + #This sets the base power generation (RF/t) for the Lapidary Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Disenchantment] + #This sets the base power generation (RF/t) for the Disenchantment Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + + [Dynamos.Gourmand] + #This sets the base power generation (RF/t) for the Gourmand Dynamo. + #Range: 10 ~ 200 + "Base Power" = 40 + +[Machines] + + [Machines.Furnace] + #This sets the base power consumption (RF/t) for the Redstone Furnace. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Sawmill] + #This sets the base power consumption (RF/t) for the Sawmill. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Pulverizer] + #This sets the base power consumption (RF/t) for the Pulverizer. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Smelter] + #This sets the base power consumption (RF/t) for the Induction Smelter. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Insolator] + #This sets the base power consumption (RF/t) for the Phytogenic Insolator. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Centrifuge] + #This sets the base power consumption (RF/t) for the Centrifugal Separator. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Press] + #This sets the base power consumption (RF/t) for the Multiservo Press. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Crucible] + #This sets the base power consumption (RF/t) for the Magma Crucible. + #Range: 1 ~ 200 + "Base Power" = 80 + + [Machines.Chiller] + #This sets the base power consumption (RF/t) for the Blast Chiller. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Refinery] + #This sets the base power consumption (RF/t) for the Fractionating Still. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Pyrolyzer] + #This sets the base power consumption (RF/t) for the Pyrolyzer. + #Range: 1 ~ 200 + "Base Power" = 5 + + [Machines.Bottler] + #This sets the base power consumption (RF/t) for the Fluid Encapsulator. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Brewer] + #This sets the base power consumption (RF/t) for the Alchemical Imbuer. + #Range: 1 ~ 200 + "Base Power" = 20 + + [Machines.Crafter] + #This sets the base power consumption (RF/t) for the Sequential Fabricator. + #Range: 1 ~ 200 + "Base Power" = 20 + +[Crops] + #If TRUE, Glimmercap Mushrooms produce light when fully grown. Disabling this may improve performance. + "Glowstone Mushroom Light" = true + #If TRUE, Fluxtooth Mushrooms produce light when fully grown. Disabling this may improve performance. + "Redstone Mushroom Light" = true + #If TRUE, Fluxtooth Mushrooms emit a redstone signal when fully grown. Disabling this may improve performance. + "Redstone Mushroom Signal" = true +