Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

config/everycomp-common.toml

@@ -12,6 +12,8 @@
 	debug_packet = false
 	#Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks
 	generate_dynamic_assets = true
+	#Allow the item_search or searchBar to be visible.
+	tab_item_search = true
 
 	[general.tooltips]
 		#Enabled tooltips showing which mod an EC item is from

config/everycomp-hazardous.toml

@@ -0,0 +1,52 @@
+
+#    ═════════════════════════ Attention ═════════════════════════
+#    Don't use this if you don't know what you are doing
+#        REASON:
+#    This file is a conditional registration. This is harmless in Singleplayer World,
+#    but harmful in SERVER because you won't able to join.
+#
+#    ══════════════════════════ Detail ═══════════════════════════
+#    This file allow you to exclude WoodTypes, LeavesType, EntrySet, or a Module
+#    1) You can find their names for WoodTypes, LeavesType, or EntrySet in `everycomp-entries.toml`
+#    2) Leave a value empty to disable that rule.
+#
+#    Module - is a Supported Mod, just a modId is sufficient.
+#    EntrySet - is a FurnitureType or DecorativeType that Wood-Good is supporting via the mod. it is either block or item.
+#
+#    NOTE: blacklisting a Module will be applied to Wood-Good, Stone-Zone, Gems-Realm
+#
+[woodtype]
+	#Exclude WoodType from all of Modules
+	#    EXAMPLE: blacklist = [
+	#        "forestry:.*fireproof.*",		COMMENT: .* is an RegEx, it exclude all of WoodType containing "fireproof" from Forestry
+	#        "biomesoplenty:.*",				COMMENT: .* is an RegEx, it exclude all of WoodType from Wood Mod for any Module
+	#        "biomesoplenty:redwood"		COMMENT: exclude redwood from Wood Mod for any module
+	#    ]
+	#
+	blacklist = []
+
+[leavestype]
+	#Exclude LeavesType from all of Modules
+	#	The example is same as WoodType's
+	blacklist = []
+
+[entryset]
+	#Exclude EntrySet from the module for All of WoodType or LeavesType
+	#    This is only applied to Wood-Good.
+	#    EXAMPLE: blacklist = [
+	#        "chipped:checkered_trapdoor",	COMMENT: chipped:checkered_oak_trapdoor without "oak"
+	#        "variantvanillablocks:chest",	COMMENT: variantvanillablocks:oak_chest without "oak"
+	#        "chipped:.*"					COMMENT: .* is an regex which will exclude all of EntrySets from one Module - Wood-Good ONLY
+	#    ]
+	#
+	blacklist = []
+
+[module]
+	#Exclude Module From Wood-Good, Stone-Zone & Gems-Realm
+	#    EXAMPLE: blacklist = [
+	#        "chipped",
+	#        "variantvanillablocks"
+	#    ]
+	#
+	blacklist = []
+

config/fancymenu/options.txt

@@ -53,6 +53,7 @@ F:layout_editor_grid_snapping_strength = '1.0';
 S:anchor_overlay_color_base_override = '';
 I:layout_editor_grid_size = '10';
 B:invert_anchor_overlay_color = 'false';
+B:enable_buddy = 'true';
 S:anchor_overlay_color_border_override = '';
 F:anchor_overlay_opacity_normal = '0.5';
 F:anchor_overlay_opacity_busy = '0.7';

config/fpsreducer/fpsreducer-client.toml

@@ -10,7 +10,7 @@
 	#Range: 1 ~ 60
 	idleFps = 10
 	#Max frame rate during GUI screen(Inventory/Menu) is opened. (0:OFF)
-	#Range: 0 ~ 60
+	#Range: 0 ~ 260
 	guiScreenFps = 0
 	#Max frame rate when the character is stationary. (0:OFF)
 	#Range: 0 ~ 260

config/greate-recipes.yaml

@@ -0,0 +1,7 @@
+# Enable/Disable wire coating recipes in the crafting grid/packer/assembler.
+# If disabled, wire coating recipes will only be accessible via the spout & wire coating factory.
+enableGTWireCoatingRecipes: true
+
+# Enable/Disable harder recipes for various Create blocks & items.
+enableHardCreateRecipes: false
+

config/gtceu.yaml

@@ -9,7 +9,7 @@ recipes:
   disableManualCompression: true
 
   # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods.
-  # Default: false
+  # Default: true
   harderRods: false
 
   # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder.
@@ -50,7 +50,7 @@ recipes:
   nerfPaperCrafting: true
 
   # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more.
-  # Default: false
+  # Default: true
   hardAdvancedIronRecipes: true
 
   # Whether to make coloring blocks like Concrete or Glass harder.
@@ -86,7 +86,7 @@ recipes:
   hardMultiRecipes: false
 
   # Whether tools should have enchants or not. Like the flint sword getting fire aspect.
-  # Default: true
+  # Default: false
   enchantedTools: false
 
 worldgen:
@@ -153,14 +153,8 @@ worldgen:
     oreIndicatorChunkCacheSize: 2048
 
 machines:
-  # Whether insufficient energy supply should reset Machine recipe progress to zero.
-  # If true, progress will reset.
-  # If false, progress will decrease to zero with 2x speed
-  # Default: false
-  recipeProgressLowEnergy: false
-
   # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more.
-  # Default: false
+  # Default: true
   requireGTToolsForBlocks: true
 
   # Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava
@@ -188,6 +182,10 @@ machines:
   # Default: true
   machineSounds: true
 
+  # Duration in ticks that batching will try to reach.
+  # Default: 100
+  batchDuration: 100
+
   # Whether Steam Multiblocks should use Steel instead of Bronze.
   # Default: false
   steelSteamMultiblocks: true
@@ -213,6 +211,10 @@ machines:
   # Default: true
   enableMaintenance: true
 
+  # Time in ticks between when Multiblocks can require Maintenance. By default, 48 hours.
+  # Default: 3456000
+  maintenanceTime: 3456000
+
   # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc.
   # Default: true
   enableWorldAccelerators: false
@@ -279,7 +281,7 @@ machines:
 
   # Whether the Assembly Line should require the fluid inputs to be in order.
   # (Requires Ordered Assembly Line Item Inputs to be enabled.)
-  # Default: false
+  # Default: true
   orderedAssemblyLineFluids: false
 
   # Default maximum parallel of steam multiblocks
@@ -355,6 +357,11 @@ client:
   # Default: true
   machinesEmissiveTextures: true
 
+  # Whether most machines will have block entity renderers, mainly used for rendering certain covers. (Restart required)
+  # Disable if experiencing performance issues.
+  # Default: true
+  machinesHaveBERsByDefault: true
+
   # Whether or not sounds should be played when using tools outside of crafting.
   # Default: true
   toolUseSounds: true
@@ -369,8 +376,8 @@ client:
   defaultPaintingColor: #FFFFFF
 
   # The default color to overlay onto Machine (and other) UIs.
-  # 16777215 (#FFFFFF) is no coloring (like GTCE) (default).
-  # 13819135 (#D2DCFF in decimal) is the classic blue from GT5.
+  # #FFFFFF is no coloring (like GTCE) (default).
+  # #D2DCFF is the classic blue from GT5.
   defaultUIColor: #FFFFFF
 
   # Use VBO cache for multiblock preview.
@@ -408,6 +415,14 @@ client:
     # Default: true
     renderFluids: true
 
+    # Whether or not to color tiered machine highlights in the tier color
+    # Default: true
+    coloredTieredMachineOutline: true
+
+    # Whether or not to color wire/cable highlights based on voltage tier
+    # Default: true
+    coloredWireOutline: true
+
 # Config options for Tools and Armor
 tools:
   # Random chance for electric tools to take actual damage
@@ -478,7 +493,7 @@ gameplay:
   universalHazards: true
 
   # Whether environmental hazards like pollution or radiation are active
-  # Default: true
+  # Default: false
   environmentalHazards: false
 
   # How much environmental hazards decay per chunk, per tick.
@@ -516,7 +531,7 @@ compat:
     updateIntervals: 40
 
     # The energy consumption of ME Hatch/Bus.
-    # Default: 1.0AE/t
+    # Default: 4.0AE/t
     meHatchEnergyUsage: 1.0
 
   # Config options regarding GTCEu compatibility with minimap mods
@@ -560,7 +575,7 @@ compat:
     buttonAnchor: BOTTOM_LEFT
 
     # Which direction the buttons will go
-    # Default: "HORIZONTAL"
+    # Default: "VERTICAL"
     direction: HORIZONTAL
 
     # How horizontally far away from the anchor to place the buttons
@@ -571,10 +586,6 @@ compat:
     # Default: 0
     yOffset: 0
 
-    # Whether to put buttons on a separate toolbar on the right instead of the map type toolbar in JourneyMap.
-    # Default: true
-    rightToolbar: true
-
   # Whether to hide facades of all blocks in JEI and creative search menu.
   # Default: true
   hideFacadesInRecipeViewer: true

config/immersive_optimization.json

@@ -25,7 +25,7 @@
     "minecraft:arrow": false,
     "create": false,
     "minecraft:ender_dragon": false,
-	"sandworm_mod": false
+    "sandworm_mod": false
   },
   "version": 2,
   "name": "immersive_optimization"

config/jade/plugins.json

@@ -72,6 +72,7 @@
     "auto_output_info": true,
     "workable_provider": true,
     "transformer": true,
+    "energy_converter_provider": true,
     "controllable_provider": true,
     "me_pattern_buffer": true,
     "exhaust_vent_info": true,

config/jade/sort-order.json

@@ -70,6 +70,7 @@
   "gtceu:custom_fluid_storage": null,
   "gtceu:custom_item_storage": null,
   "gtceu:electric_container_provider": null,
+  "gtceu:energy_converter_provider": null,
   "gtceu:exhaust_vent_info": null,
   "gtceu:fluid_storage": null,
   "gtceu:hazard_cleaner_provider": null,

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

@@ -133,3 +133,4 @@ tacz:gun_smith_table/tacz_attachment_workbench
 tacz:gun_smith_table/tacz_gun_smith_table
 taczammoquery:ammo_query
 tfclunchbox:fill_capsule
+tacz:gun_smith_table/create_armorer_create_workbench

config/sodiumdynamiclights-client.toml

@@ -4,7 +4,7 @@
 	#Allowed Values: OFF, SLOW, FAST, REALTIME
 	mode = "REALTIME"
 	#Enable entities light source.
-	entities = false
+	entities = true
 	#Enable first-person player light source.
 	self = true
 	#Enable block entities light source.

pakku-lock.json

@@ -12632,14 +12632,18 @@
                 "64uacGcEw697jVGs"
             ],
             "type": "MOD",
+            "side": "BOTH",
             "slug": {
-                "curseforge": "tfc-punishment-for-death"
+                "curseforge": "tfc-punishment-for-death",
+                "modrinth": "tfc-punishment-for-death"
             },
             "name": {
-                "curseforge": "TFC Punishment for Death"
+                "curseforge": "TFC Punishment for Death",
+                "modrinth": "TFC Punishment for Death"
             },
             "id": {
-                "curseforge": "1258250"
+                "curseforge": "1258250",
+                "modrinth": "hupCZlMO"
             },
             "files": [
                 {
@@ -12665,6 +12669,30 @@
                     ],
                     "size": 34133,
                     "date_published": "2025-06-04T10:12:24.677Z"
+                },
+                {
+                    "type": "modrinth",
+                    "file_name": "TFC_punishment_for_death-1.20.1-1.0.0.15.jar",
+                    "mc_versions": [
+                        "1.20.1"
+                    ],
+                    "loaders": [
+                        "forge",
+                        "neoforge"
+                    ],
+                    "release_type": "beta",
+                    "url": "https://cdn.modrinth.com/data/hupCZlMO/versions/lAz6Jz59/TFC_punishment_for_death-1.20.1-1.0.0.15.jar",
+                    "id": "lAz6Jz59",
+                    "parent_id": "hupCZlMO",
+                    "hashes": {
+                        "sha512": "285289bbe30b8dfd3c5f1093bfdb9bbea008053ef2b1ceefbd6562304e5335f9feb59fb4e359acaf0776dc9825e652daaf558a75254caad9cfed21d3f9fb1a39",
+                        "sha1": "0c7ff3607981f60970fdf85ee52c7e50ad9f5fcd"
+                    },
+                    "required_dependencies": [
+                        "JaCEZUhg"
+                    ],
+                    "size": 34133,
+                    "date_published": "2025-07-15T13:40:22.577013Z"
                 }
             ]
         },

pakku.json

@@ -19,7 +19,8 @@
         "server_starter.conf",
         "server-icon.png",
         "start_server.bat",
-        "README.md"
+        "README.md",
+        "!kubejs/assets/**"
     ],
     "client_overrides": [
         "resourcepacks"