diff --git a/config/DistantHorizons.toml b/config/DistantHorizons.toml index 95e8e36..b8f987b 100644 --- a/config/DistantHorizons.toml +++ b/config/DistantHorizons.toml @@ -1,6 +1,7 @@ _Versions = "1.6.3a" # Show the lod button in the options screen next to fov optionsButton = true +_version = 1 [client] @@ -310,7 +311,7 @@ optionsButton = true # # This setting shouldn't affect performance. # - vanillaOverdraw = "DYNAMIC" + vanillaOverdraw = "ALWAYS" # Will prevent some overdraw issues, but may cause nearby fake chunks to render incorrectly # especially when in/near an ocean. # diff --git a/config/PregenConfig.toml b/config/PregenConfig.toml index 68b84ed..f635ba2 100644 --- a/config/PregenConfig.toml +++ b/config/PregenConfig.toml @@ -23,8 +23,7 @@ docker-warning = true #Defines if the pregenerator should automatically restart on server start. Automatically set to true when a task is running, and automatically set to false if no task is running auto-restart = false - #Defines if the Profiler should run in the background or not - enable-profiler = false + info = true [client] @@ -41,34 +40,3 @@ #Range: 0.1 ~ 10.0 scale = 1.0 - [client.profiler-overlay] - #Defines if the Profiler Overlay should be enabled - profiler-overlay = true - #Defines the Horizontal Alignment of the UI, left to right - #Allowed Values: START, CENTER, END - horizontal-alignment = "START" - #Defines the Vertical Alignment of the UI, top to bottom - #Allowed Values: START, CENTER, END - vertical-alignment = "START" - #Defines the Scale of the Overlay - #Range: 0.1 ~ 10.0 - scale = 1.0 - #Reference to save which dimension is currently detailed - detailed-dimension = "minecraft:overworld" - - [client.MiniMap] - #If you have access to this feature if it should be enabled. This will just turn off the MiniMap and disable any data synchronization - enable-minimap = true - #This decides the LOD (Level Of Detail) of the MiniMap. This is here to ensure you can control how much GPU ram you will need - #There are 4 modes, Auto, MAX, High, Medium - #AUTO will basically ensure the minimap will never exceed 300MB of GPU ram per minimap - #MAX will basically apply no LOD. Which at max radius (1k chunks) will require 4GB of GPU Ram - #High is the first level of LOD. Which will only show 1/4th of the detail. Which will take at max radius 1GB of GPU ram - #Medium is the second level of LOD. Which will only show 1/16th of the detail. Which will take at max radius 250MB of GPU Ram - #Allowed Values: AUTO, MAX, HIGH, MEDIUM - lod = "AUTO" - #If you hover with your mouse over the MiniMap that it should show a large version of said miniMap - large-hover = true - #If you need to refresh the Supporter info set this to true and on the next game restart it will automatically update the info. - update-supporters = false - diff --git a/config/chiselsandbits-client-compat-jei.toml b/config/chiselsandbits-client-compat-jei.toml new file mode 100644 index 0000000..1d17bc2 --- /dev/null +++ b/config/chiselsandbits-client-compat-jei.toml @@ -0,0 +1,7 @@ + +[compat] + + [compat.jei] + #Should C&B inject its bits into JEI? + inject-bits = true + diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml index 0c46ba1..472238b 100644 --- a/config/chiselsandbits-client.toml +++ b/config/chiselsandbits-client.toml @@ -8,15 +8,15 @@ invert-durability-bar-indication = false [settings.chiseling-previews] - #settings.chiseling-previews.renderer.comment + #Sets which preview renderer is in use. Currently C&B provides: `chiselsandbits:default` (Simple outline rendering) and `chiselsandbits:noop` (No preview) as options. renderer = "chiselsandbits:default" [settings.chiseling-previews.default] [settings.chiseling-previews.default.colors] - #settings.chiseling-previews.default.colors.chiseling.comment + #The color for the chiseling preview outline. chiseling = [0.85, 0.0, 0.0, 0.65] - #settings.chiseling-previews.default.colors.placement.comment + #The color for the placement preview outline. placement = [0.0, 0.85, 0.0, 0.65] [settings.chiseling-previews.debug] @@ -26,43 +26,61 @@ [settings.chiseling-previews.debug.mutator] [settings.chiseling-previews.debug.mutator.colors] - #settings.chiseling-previews.debug.mutator.colors.chiseling.comment + #The color of the chiseling mutation area in the chiseling preview. chiseling = [0.0, 0.0, 0.85, 0.65] - #settings.chiseling-previews.debug.mutator.colors.placement.comment + #The color of the placement mutation area in the placement preview. placement = [0.85, 0.85, 0.0, 0.65] [settings.selected-tool-mode-icons] - #settings.selected-tool-mode-icons.renderer.comment + #Sets which tool mode icon renderer is in use. Currently C&B provides: `chiselsandbits:group` (Render the group icon in the top right corner) and `chiselsandbits:noop` (No icon) as options. renderer = "chiselsandbits:group" [settings.clipboard] - #settings.clipboard.size.comment + #The amount of blocks to keep in the creative clipboard. #Range: 0 ~ 64 size = 64 - #mod.chiselsandbits.config.settings.clipboard.addbrokenblocks.comment - addBrokenBlocks = true - #mod.chiselsandbits.config.settings.clipboard.addpickedblocks.comment - addPickedBlocks = true + #When set to true this adds broken chiseled blocks to the creative clipboard. + add-broken-blocks = true + #When set to true this adds picked chiseled blocks to the creative clipboard. + add-picked-blocks = true [settings.patterns] - #settings.patterns.export-path.comment + #The path where exported patterns should be saved. export-path = "./chiselsandbits/patterns" + [settings.placement] + + [settings.placement.render-mode] + #The render mode of successful placement + #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME + success = "GHOST_BLOCK_MODEL" + #The render mode of failed placement + #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME + failed = "GHOST_BLOCK_MODEL_SOLID_COLOR" + + [settings.placement.color] + #The color of successful placement + success = [0.1882352977991104, 0.47058823704719543, 0.7882353067398071, 0.7058823704719543] + #The color of failure due to the block not fitting + not-fitting = [0.7176470756530762, 0.2549019753932953, 0.054901961237192154, 0.7058823704719543] + #The color of failure due to a lack of bits or space + missing-bits-or-space = [1.0, 0.8588235378265381, 0.3450980484485626, 0.7058823704719543] + [performance] [performance.caches] [performance.caches.sizes] - #performance.caches.sizes.bit-storage-content-models.comment + #Size of the bit storage inner models cache. #Range: 0 ~ 9223372036854775807 bit-storage-content-models = 100 - #performance.caches.sizes.block-models.comment + #Size of the block model cache. #Range: 3500 ~ 20000 block-models = 10000 - #performance.caches.sizes.block-faces.comment + #Size of the model face cache. #Range: 350000 ~ 2000000 block-faces = 1000000 - #performance.caches.sizes.stack-models.comment + #Size of the item stack model cache. #Range: 0 ~ 9223372036854775807 stack-models = 100 @@ -73,9 +91,9 @@ extract-lighting-values-from-blockstates = true [performance.model-building] - #performance.model-building.thead-count.comment + #How many CPU threads should be used to build models? #Range: 1 ~ 16 - thead-count = 8 + thread-count = 8 [gui] diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml index b648725..2b9783e 100644 --- a/config/chiselsandbits-common.toml +++ b/config/chiselsandbits-common.toml @@ -8,12 +8,12 @@ [performance.caches] [performance.caches.sizes] - #performance.caches.sizes.collision-boxes.comment + #Size of the collision box cache. #Range: 0 ~ 9223372036854775807 collision-boxes = 10000 [performance.saving] - #performance.saving.thread-count.comment + #The thread count used during saving and compressing of data from chiseled block entity. #Range: 1 ~ 16 thread-count = 8 diff --git a/config/create-client.toml b/config/create-client.toml index 6de0575..14993a6 100644 --- a/config/create-client.toml +++ b/config/create-client.toml @@ -118,3 +118,11 @@ #Range: 0.0 ~ 1.0 ambientVolumeCap = 0.10000000149011612 + # + #Railway related settings + [client.trains] + # + #How far away the Camera should zoom when seated on a train + #Range: 0.0 ~ 3.4028234663852886E38 + mountedZoomMultiplier = 3.0 + diff --git a/config/create-common.toml b/config/create-common.toml index 61e10bd..d76c2a7 100644 --- a/config/create-common.toml +++ b/config/create-common.toml @@ -20,10 +20,10 @@ #Range: 0.0 ~ 512.0 frequency = 0.0833333358168602 # - #Range: > -64 + #Range: > -2147483648 minHeight = 40 # - #Range: > -64 + #Range: > -2147483648 maxHeight = 90 [worldgen.v2.striated_ores_overworld] @@ -38,10 +38,10 @@ #Range: 0.0 ~ 512.0 frequency = 0.0833333358168602 # - #Range: > -64 + #Range: > -2147483648 minHeight = -30 # - #Range: > -64 + #Range: > -2147483648 maxHeight = 70 [worldgen.v2.zinc_ore] @@ -56,9 +56,9 @@ #Range: 0.0 ~ 512.0 frequency = 8.0 # - #Range: > -64 + #Range: > -2147483648 minHeight = -63 # - #Range: > -64 + #Range: > -2147483648 maxHeight = 70 diff --git a/config/createaddition-common.toml b/config/createaddition-common.toml index 5fb4666..66530ec 100644 --- a/config/createaddition-common.toml +++ b/config/createaddition-common.toml @@ -129,10 +129,4 @@ #Diamond Grit Sandpaper durability (number of uses). #Range: > 3 diamond_grit_sandpaper_uses = 1024 - #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 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/flywheel-client.toml b/config/flywheel-client.toml index 468e76f..e41e202 100644 --- a/config/flywheel-client.toml +++ b/config/flywheel-client.toml @@ -1,7 +1,7 @@ -#Enable or disable the entire engine +#Select the backend to use. #Allowed Values: OFF, BATCHING, INSTANCING backend = "INSTANCING" -#Enable or disable a debug overlay that colors pixels by their normal +#Enable or disable a debug overlay that colors pixels by their normal. debugNormals = false #Enable or disable instance update limiting with distance. limitUpdates = true diff --git a/config/forge-client.toml b/config/forge-client.toml index c4815f0..58d46d1 100644 --- a/config/forge-client.toml +++ b/config/forge-client.toml @@ -13,4 +13,6 @@ useCombinedDepthStencilAttachment = false #Forces the use of System.nanoTime instead of glfwGetTime, as the main Util time provider forceSystemNanoTime = false + #When enabled, Forge will convert discovered 'Open to LAN' IPv6 addresses to their more compact, compressed representation + compressLanIPv6Addresses = true diff --git a/config/forge-common.toml b/config/forge-common.toml index bef1dd9..c01fb4b 100644 --- a/config/forge-common.toml +++ b/config/forge-common.toml @@ -4,4 +4,10 @@ #Defines a default world type to use. The vanilla default world type is represented by 'default'. #The modded world types are registry names which should include the registry namespace, such as 'examplemod:example_world_type'. defaultWorldType = "default" + #Set this to true to cache resource listings in resource and data packs + cachePackAccess = true + #Set this to true to index vanilla resource and data packs on thread + indexVanillaPackCachesOnThread = false + #Set this to true to index mod resource and data packs on thread + indexModPackCachesOnThread = false diff --git a/config/immersive_weathering-common.toml b/config/immersive_weathering-common.toml index 69830d5..e590e77 100644 --- a/config/immersive_weathering-common.toml +++ b/config/immersive_weathering-common.toml @@ -52,8 +52,6 @@ block_growths_enabled = true icicle_fire_resistance = true #Allows icicles to be eaten icicle_food = true - #Allows moss clump to be eaten - moss_food = true [leaf_piles] #Enables leaf piles patches features to spawn in forests. Currently does nothing as they have been temporarily (or not) yeeted diff --git a/config/immersiveengineering-client.toml b/config/immersiveengineering-client.toml index 8676f27..e88e556 100644 --- a/config/immersiveengineering-client.toml +++ b/config/immersiveengineering-client.toml @@ -3,8 +3,6 @@ disableFancyTESR = false #Show the text overlay for various blocks, such as the configuration of capacitors or pumps showTextOverlay = true -#Set this to false to disable the super awesome looking nixie tube front for the voltmeter and other things -nixietubeFont = true #Set the GUI scale of the Engineer's Manual. This uses the same numbers as Vanilla's GUI Scale and is therefor limited to the maximum value available ingame. #Range: 1 ~ 32 manualGuiScale = 4 @@ -26,6 +24,8 @@ earDefenders_SoundBlacklist = [] #Use VBOs to render certain blocks. This is significantly faster than the usual rendering, #but may not work correctly with visual effects from other mods enableVBO = true +#Set this to false to change fluid recipes in the manual to use decimals on buckets instead of fractions +fluidFractions = true #Options to set the RGB color of all IE wire types [wire_colors] diff --git a/config/immersiveengineering-common.toml b/config/immersiveengineering-common.toml index 692ac41..39e680c 100644 --- a/config/immersiveengineering-common.toml +++ b/config/immersiveengineering-common.toml @@ -10,8 +10,6 @@ importantInfo = true preferredOres = ["immersiveengineering", "minecraft"] [debug] - #A config setting to enable debug features. These features may vary between releases, may cause crashes, and are unsupported. Do not enable unless asked to by a developer of IE. - enableDebug = false [debug.wires] #Enable detailed logging for the wire network. This can be useful for developers to track down issues related to wires. @@ -26,5 +24,4 @@ preferredOres = ["immersiveengineering", "minecraft"] curios = true computercraft = true oc2 = true - crafttweaker = true diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 8009ce4..8ec289a 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -45,7 +45,6 @@ create:sequenced_assembly create:spout_filling create:wood_cutting createaddition:charging -createaddition:crude_burning createaddition:rolling farmersdelight:cooking farmersdelight:cutting @@ -69,3 +68,4 @@ immersiveengineering:workbench jei:information nethersdelight:composition waystones:warp_plate +create:item_application diff --git a/config/quark-common.toml b/config/quark-common.toml index 9ca91be..f65fc9b 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -365,6 +365,8 @@ "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 + #Master Librarians will offer to exchange Ancient Tomes, provided you give them a max-level Enchanted Book of the Tome's enchantment too. + "Librarians Exchange Ancient Tomes" = true [tools.ambient_discs] "Drop On Spider Kill" = true @@ -1633,6 +1635,8 @@ "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 + #Candles with soul sand below them or below the bookshelves dampen enchantments instead of influence them. + "Soul Candles Invert" = true [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/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml index b34b4bc..8c0a46f 100644 --- a/config/sophisticatedbackpacks-common.toml +++ b/config/sophisticatedbackpacks-common.toml @@ -7,6 +7,10 @@ chestLootEnabled = true #Turns on/off item fluid handler of backpack in its item form. There are some dupe bugs caused by default fluid handling implementation that manifest when backpack is drained / filled in its item form in another mod's tank and the only way to prevent them is disallowing drain/fill in item form altogether itemFluidHandlerEnabled = true + #Determines whether player can right click on backpack that another player is wearing to open it. If off will turn off that capability for everyone and remove related settings from backpack. + allowOpeningOtherPlayerBackpacks = true + #Allows disabling item display settings. Primarily in cases where custom backpack model doesn't support showing the item. (Requires game restart to take effect) + itemDisplayDisabled = false #Leather Backpack Settings [common.leatherBackpack] @@ -202,6 +206,8 @@ #Number of filter slots displayed in a row #Range: 1 ~ 6 slotsInRow = 3 + #Determines whether void upgrade allows voiding anything or it only has overflow option + voidAnythingEnabled = true #Advanced Void Upgrade Settings [common.advancedVoidUpgrade] @@ -211,6 +217,8 @@ #Number of filter slots displayed in a row #Range: 1 ~ 6 slotsInRow = 4 + #Determines whether void upgrade allows voiding anything or it only has overflow option + voidAnythingEnabled = true #Stack Upgrade Settings [common.stackUpgrade] @@ -386,6 +394,8 @@ #Chance increase per looting level of mob dropping backpack #Range: 0.0 ~ 0.2 lootingChanceIncreasePerLevel = 0.01 + #Determines whether backpack drops to fake players if killed by them in addition to real ones that it always drops to + dropToFakePlayers = false [common.nerfs] #Determines if too many backpacks in player's inventory cause slowness to the player @@ -396,4 +406,6 @@ #Ratio of slowness levels per every backpack above the maximum number allowed. (number of backpacks above the max gets multiplied by this number and ceiled) #Range: 0.1 ~ 5.0 slownessLevelsPerAdditionalBackpack = 1.0 + #Determines if active upgrades will only work in the backpack that's worn by the player. Active upgrades are for example magnet, pickup, cooking, feeding upgrades. + onlyWornBackpackTriggersUpgrades = false diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt index effe49f..a12ef36 100644 --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -98,6 +98,13 @@ hideMinimapUnderF3:true manualCaveModeStartAuto:true manualCaveModeStart:-1 chunkGridLineWidth:1 +temporaryWaypointsGlobal:true +keepUnlockedWhenEnlarged:false +enlargedMinimapAToggle:false +displayPacPlayers:true +displayClaims:true +displayCurrentClaim:true +claimsOpacity:80 interface:dummy:0:36:true:false:false:false interface:dummy:0:10000:true:false:false:false interface:dummy:0:0:false:false:true:false diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 080baa0..7c1e24b 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -1,6 +1,7 @@ { "hardInclude": "anything", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [ "minecraft:glow_item_frame", @@ -16,8 +17,8 @@ "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "startFadingAt": 0.0, "dotSize": 2.0, + "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "displayY": false, "icons": 2.0, @@ -29,6 +30,7 @@ { "hardInclude": "living", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [ "minecraft:armor_stand" @@ -43,6 +45,7 @@ { "hardInclude": "players", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_players", @@ -56,6 +59,7 @@ { "hardInclude": "same-team", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_same_team", @@ -66,6 +70,7 @@ { "hardInclude": "anything", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_other_teams", @@ -80,6 +85,7 @@ { "hardInclude": "hostile", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_hostile", @@ -91,6 +97,7 @@ { "hardInclude": "tamed", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_hostile_tamed", @@ -105,6 +112,7 @@ { "hardInclude": "anything", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_friendly", @@ -114,6 +122,7 @@ { "hardInclude": "tamed", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_friendly_tamed", @@ -130,6 +139,7 @@ { "hardInclude": "items", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_items", @@ -144,6 +154,7 @@ { "hardInclude": "anything", "includeList": [], + "includeListInSuperCategory": false, "excludeMode": "ONLY", "excludeList": [], "name": "gui.xaero_entity_category_other_entities",