Config file updates

src/minecraft/config/ae2/client.json

@@ -9,7 +9,7 @@
     "useTerminalUseLargeFont": false,
     "useColoredCraftingStatus": true,
     "PowerUnit_comment": "Power unit shown in AE UIs",
-    "PowerUnit": "ae",
+    "PowerUnit": "fe",
     "showDebugGuiOverlays_comment": "Show debugging GUI overlays",
     "showDebugGuiOverlays": false,
     "showPlacementPreview_comment": "Show a preview of part and facade placement",

src/minecraft/config/ars_nouveau-client.toml

@@ -61,6 +61,8 @@ yManaBar = 0
 showRecipeBook = true
 # Inform the player of Dynamic lights once.
 informLights = false
+# Whether the Selection HUD is toggled or held
+toggleSelectionHUD = true
 
 # Misc
 [misc]

src/minecraft/config/colouredstuff.toml

@@ -1,13 +1,16 @@
-# Colourable Stuff config
+# Colourable Stuff config.  For modpack devs: also see the datapack for custom recipes and item tags.
 [colouredstuff]
 
+# Items tagged with any 'forge/dyes:' colour including dyes/none will edit blocks in world when used and switch to that colour.  Even when enabled, valid dyes that are also tagged as stationery writing implements will be ignored from this feature, see forge:tools/stationery (for example the Chalk mod items are both dyes and stationery tools)
 [colouredstuff.in_world_dye]
 # Use dye items on blocks in-world to change dye colour of target block
 enabled = true
 # Also allows you to sneak and dye multiple blocks from the mod all at once for the same cost (only works if enabled=true also)
 multi_block = true
 # If enabled, then vanilla blocks can also be dyed in world and converted to the modded block (only works if enabled=true also)
 vanilla_override = true
+# Will the dye get consumed when dye-ing blocks in world.  Changing to false will mean right clicking blocks with dye will not consume any items from your stack
+consume = true
 
 [colouredstuff.water]
 # Is the dyed water an infinite source like regular water where new source blocks get generated

src/minecraft/config/cucumber-tags.json

@@ -25,7 +25,7 @@
   "forge:ingots/platinum": "exnihilosequentia:platinum_ingot",
   "forge:dusts/sulfur": "immersiveengineering:dust_sulfur",
   "forge:ingots/lead": "exnihilosequentia:lead_ingot",
-  "forge:ingots/graphite": "biggerreactors:graphite_ingot",
+  "forge:ingots/graphite": "null",
   "forge:gems/peridot": "null",
   "forge:ingots/uranium": "exnihilosequentia:uranium_ingot",
   "forge:ingots/nickel": "exnihilosequentia:nickel_ingot"

src/minecraft/config/cyclic.toml

@@ -237,7 +237,7 @@ enabled = false
 [cyclic.blocks]
 # If true, then all potions marked as harmful/negative will be used in addition to the 'anti_beacon.potion_list' for cures and immunities  (used by both sponge and artemisbeacon).
 harmful_potions = true
-#   Allows the dimensional Transfer Nodes to cross dimensions (no chunk loading is done, you have to do that on your own); This affects blocks cyclic:wireless_energy, cyclic:wireless_item, cyclic:wireless_fluid, cyclic:wireless_transmitter; If you change it to false it will only work if the target is in the same dimension.
+#  Allows the dimensional Transfer Nodes to cross dimensions (no chunk loading is done, you have to do that on your own); This affects blocks cyclic:wireless_energy, cyclic:wireless_item, cyclic:wireless_fluid, cyclic:wireless_transmitter; If you change it to false it will only work if the target is in the same dimension.
 wireless_transfer_dimensional = true
 
 [cyclic.blocks.peace_candle]
@@ -598,7 +598,7 @@ capacity = 16000
 
 [cyclic.blocks.facades]
 #
-#  These blocks are not allowed to be used as Facades for blocks because they look weird (used by cables and Glowstone Facade and Soundproofing Facade and others)
+#  These blocks are not allowed to be used as Facades for blocks because they look weird (used by cables and Glowstone Facade and Soundproofing Facade and others).  If you want to ignore one entire mod use an entry like this : storagenetwork:*
 itemsNotAllowed = [
   "minecraft:ladder",
   "minecraft:double_plant",

src/minecraft/config/exnihilosequentia-common.toml

@@ -42,7 +42,7 @@ secondsToCompost = 10
 [barrel.fluid_transform]
 # Number of seconds to transform fluids (Default: 10)
 # Range: > 1
-secondsToTransformFluid = 10
+secondsToTransformFluid = 5
 
 # Crook Configs
 [crook]

src/minecraft/config/itemborders-common.toml

@@ -1,13 +1,50 @@
+# Client Configuration
+[client]
+
 [client.options]
+# If the hotbar should display item borders.
 hotbar = true
+# If item borders should show for common items.
 show_for_common = false
+# If the borders should have square corners.
 square_corners = true
+# If the borders should fully envelop item slots (otherwise they will only show on the bottom portion of the slot).
 full_border = false
+# If the borders draw over items instead of under.
 over_items = false
+# If the borders should have a more prominent glow.
 extra_glow = false
+# If automatic borders (based on item rarity) should be enabled.
 auto_borders = true
+# If enabled and Legendary Tooltips is installed, borders will sync with tooltip border colors.
 legendary_tooltips_sync = false
 
+# Custom border colors for specific items. Format: { <color> = ["list of selectors"] }.
+# Color formats supported:
+#   Hex color code - A hex color code is preceded by # or 0x and must be quoted.  Supports 3, 4, 6, or 8 digit codes in the formats RGB, ARGB, RRGGBB, or AARRGGBB.  Examples: "#F4C", "0xFEE0", "#40FF2E", "#CC00E2EE"
+#   Decimal color code - A decimal color code, which is just a hex color code converted to decimal.  May or may not be quoted.  Examples: 15614720, "4278251143"
+#   Minecraft color name - One of the standard 16 Minecraft color names.  May or may not be quoted.  Examples: "red", "dark_purple", "gold"
+#   Web color name - One of the standard 140 web/HTML color names or "transparent".  May or may not be quoted.  Examples: "chartreuse", "darkorange", "deeppink", "deepskyblue"
+#   Modifiers - Colors specified in any of the above formats can be modified by using modifiers.
+#     Modifiers are specified after any color in the format "<+, -, or =><h, s, v, r, g, b, or a><amount>".
+#     The letters represent h - hue, s - saturation, v - value, r - red, g - green, b - blue, a - alpha.
+#     Valid amounts are 0 to 255 for all types except hue, which accepts 0 to 359.
+#     Using any modifiers will REQUIRE the key to be quoted.
+#       Examples: "red+h15", "#saddlebrown-v20+s5", "10_aqua_aqua+v15-h5", "#F4C-r15-v10=a40"
+#   Animated color - An animated color that fades from one to another in sequence.
+#     A string in the format "<duration in seconds>_<list of color definitions separated by underscores>".  May or may not be quoted.  Examples: "10_black_#7FFF00", "5.5_gold_orange_orangered", "20_red_orange_yellow_green_blue_purple"
+# Selectors supported:
+#   Match all - Specifying just an asterisk (*) will match all items.  Examples: "*"
+#   Item ID - Use item ID to match single items.  Must include mod name for modded items.  Examples: "minecraft:stick", "iron_ore", "spoiledeggs:spoiled_egg"
+#   Tag - $ followed by tag name to match all items with that tag.  Examples: "$forge:stone", "$planks"
+#   Mod name - @ followed by mod identifier to match all items from that mod.  Examples: "@spoiledeggs"
+#   Rarity - ! followed by item's rarity to match all items with that rarity.  This is ONLY vanilla rarities.  Examples: "!uncommon", "!rare", "!epic"
+#   Item name color - # followed by color hex code, to match all items with that exact color item name.  Examples: "#23F632"
+#   Display name - % followed by any text.  Will match any item with this text (case-sensitive) in its tooltip display name.  Examples: "%Netherite", "%Uncommon"
+#   Tooltip text - ^ followed by any text.  Will match any item with this text (case-sensitive) anywhere in the tooltip text (besides the name).  Examples: "^Legendary"
+#   NBT tag - & followed by tag name and optional comparator (=, >, <, or !=) and value, in the format <tag><comparator><value> or just <tag>.  Examples: "&Damage=0", "&Tier>1", "&map!=128", "&Enchantments"
+#   Negation - ~ followed by any selector above.  This selector will be negated, matching every item that does NOT match the selector.  Examples: "~minecraft:stick", "~!uncommon", "~@minecraft"
+#   Combining selectors - Any number of selectors can be combined by separating them with a plus sign.  Examples: "minecraft:diamond_sword+&Enchantments", "minecraft:stick+~!common+&Damage=0"
 [client.options.manual_borders]
 "#169c9d" = [
   "obtrophies:trophy+&entity=ars_nouveau:drygmy",

src/minecraft/config/jei/ingredient-list-mod-sort-order.ini

@@ -5,12 +5,11 @@ Forbidden Smoothies
 Sf5_things
 Ex Nihilo: Sequentia
 Ex Nihilo: Coloratus
-Resourceful Lootbags
 Tinted Campfires
 Tinted Torches
 Yellow_snow
-Coloured Stuff
 Minecraft
+Coloured Stuff
 Gateways To Eternity
 OpenBlocks Trophies
 Hostile Neural Networks
@@ -25,7 +24,6 @@ Applied Energistics 2
 More Immersive Wires
 Ars Nouveau
 Baubley Heart Canisters
-Bigger Reactors
 Botania
 Chargers
 Chunk Loaders
@@ -130,3 +128,6 @@ The One Probe
 CraftingForBlockheads
 FramedBlocks
 Torchmaster
+WaybackStone
+Resourceful Lootbags
+Bigger Reactors

src/minecraft/config/jei/jei-client.ini

@@ -105,7 +105,7 @@
 	# Valid Values: A comma-separated list containing values of:
 	# [BOOKMARKED, CRAFTABLE]
 	# Default Value: BOOKMARKED, CRAFTABLE
-	RecipeSorterStages = BOOKMARKED, CRAFTABLE
+	RecipeSorterStages = CRAFTABLE, BOOKMARKED
 
 
 [tags]

src/minecraft/config/jei/recipe-category-sort-order.ini

@@ -1,8 +1,16 @@
 create:item_application
+minecraft:crafting
 lychee:block_interacting/minecraft/default
 lychee:dripstone_dripping/minecraft/default
 lychee:item_inside/minecraft/default
-minecraft:crafting
+exnihilosequentia:compost
+exnihilosequentia:crushing
+exnihilosequentia:fired_melting
+exnihilosequentia:heat
+exnihilosequentia:melting
+exnihilosequentia:precipitate
+exnihilosequentia:solidifying
+exnihilosequentia:transition
 minecraft:anvil
 minecraft:blasting
 minecraft:brewing
@@ -28,9 +36,6 @@ ars_nouveau:enchanting_apparatus
 ars_nouveau:enchantment_apparatus
 ars_nouveau:glyph_recipe
 ars_nouveau:imbuement
-biggerreactors:classic/reactor_moderator_block
-biggerreactors:classic/reactor_moderator_fluid
-biggerreactors:classic/turbine_coil
 botania:brewery
 botania:elven_trade
 botania:mana_pool
@@ -87,14 +92,6 @@ enderio:slicing
 enderio:soul_binding
 enderio:soul_engine
 enderio:tank
-exnihilosequentia:compost
-exnihilosequentia:crushing
-exnihilosequentia:fired_melting
-exnihilosequentia:heat
-exnihilosequentia:melting
-exnihilosequentia:precipitate
-exnihilosequentia:solidifying
-exnihilosequentia:transition
 extractinator:extractinating
 fluxnetworks:creating_flux
 forcecraft:freezing
@@ -219,9 +216,6 @@ veincreeper:trap
 vinery:apple_mashing
 vinery:wine_fermentation
 jeimultiblocks:multiblock
-exnihilosequentia:dry_sifting
-exnihilosequentia:harvest
-exnihilosequentia:wet_sifting
 jeresources:worldgen
 obtrophies:trophy
 framedblocks:framing_saw
@@ -232,3 +226,11 @@ chipped:glassblower
 chipped:loom_table
 chipped:mason_table
 chipped:tinkering_table
+ars_nouveau:budding_conversion
+ars_nouveau:scry_ritual
+exnihilosequentia:dry_sifting
+exnihilosequentia:harvest
+exnihilosequentia:wet_sifting
+biggerreactors:classic/reactor_moderator_block
+biggerreactors:classic/reactor_moderator_fluid
+biggerreactors:classic/turbine_coil

src/minecraft/config/refurbished_furniture.server.toml

@@ -65,6 +65,16 @@ banSendingItemsWithInventories = true
 # ]
 # ^ Note: This is just an example. Write your list below.
 bannedItems = []
+# A list of dimensions you are allowed to place mailboxes. An empty list means that
+# mailboxes can be placed in any dimension.
+# An example of how the list is defined:
+# allowedDimensions = [
+#     "minecraft:overworld",
+#     "minecraft:the_nether",
+#     ...
+# ]
+# ^ Note: This is just an example. Write your list below.
+allowedDimensions = []
 
 # Bath related properties
 [bath]
@@ -129,3 +139,14 @@ powerableAreaRadius = 80
 # The maximum amount of links that can be connected to a single electricity node.
 # Valid range: 1 to 64 (inclusive)
 maximumLinksPerElectricityNode = 6
+
+# Cheats for electricity. Free power, etc.
+[electricity.cheats]
+# Electricity Generators will now output free power, and stay on forever.
+# Valid values: true, false
+freeGeneratorPower = false
+# Makes all blocks that require electricity always be powered without them being
+# connected to an Electricity Generator. Warning, some blocks may no longer work as
+# expected. Use at your own risk of a downgraded experience.
+# Valid values: true, false
+everythingIsPowered = false

src/minecraft/config/swap_things-common.toml

@@ -166,6 +166,7 @@ SummonMountClass = [
 ]
 # List of entities for SummonMount command to EXCLUDE from possible entities
 SummonMount = [
+  "draconicevolution:draconic_guardian",
   "minecraft:wither",
   "minecraft:ender_dragon",
   "ae2:tiny_tnt_primed",