diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e507023e..ee5979bb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: changelog: ${{ steps.changelog.outputs.description }} mc_version: ${{ steps.check.outputs.minecraft_version }} loader_version: ${{ steps.check.outputs.loader_version }} + loader_type: ${{ steps.check.outputs.loader_type }} release_type: ${{ steps.check.outputs.release_type }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check.outputs.exists }} @@ -168,11 +169,14 @@ jobs: MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' MINECRAFT_VERSION=$(echo "$MC_VERSIONS_JSON" | jq -r '.[0]' | tr -d '[]"') - LOADER_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.loaders }}' - LOADER_VERSION=$(echo "$LOADER_VERSIONS_JSON" | jq -r '.forge') + LOADERS_JSON='${{ steps.pakku_lock_info.outputs.loaders }}' + + LOADER_TYPE=$(echo "$LOADERS_JSON" | jq -r 'keys[0]') + LOADER_VERSION=$(echo "$LOADERS_JSON" | jq -r ".[keys[0]]") echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT echo "loader_version=$LOADER_VERSION" >> $GITHUB_OUTPUT + echo "loader_type=$LOADER_TYPE" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then diff --git a/config/corpsecurioscompat-common.toml b/config/corpsecurioscompat-common.toml index e9aee7186..fd09d9a82 100644 --- a/config/corpsecurioscompat-common.toml +++ b/config/corpsecurioscompat-common.toml @@ -3,4 +3,6 @@ [general] #Items that should not be transferred to curios slots (format: 'modid:item') blacklisted_items = [] + #Whether cursed items should be transferred back to curios slots (true = transfer cursed items, false = don't transfer) + transfer_cursed_items = false diff --git a/config/everycomp-common.toml b/config/everycomp-common.toml index 448eaa2a1..073eb95ed 100644 --- a/config/everycomp-common.toml +++ b/config/everycomp-common.toml @@ -2,8 +2,6 @@ [general] #Puts all the added items into a new Every Compat tab instead of their own mod tabs. Be warned that if disabled it could cause some issue with some mods that have custom tabs creative_tab = true - #Makes dynamic assets that are generated depend on loaded resource packs. Turn off to make them just use vanilla assets - assets_depend_on_loaded_packs = true #Creates a debug folder inside your instance directory where all the dynamically generated resources will be saved save_debug_resources = false #Sends a packet to verify all dependencies mod versions are the same on connect. DIsable if it causes issues diff --git a/config/everycomp-hazardous.toml b/config/everycomp-hazardous.toml index 3764b8de9..55a35bf79 100644 --- a/config/everycomp-hazardous.toml +++ b/config/everycomp-hazardous.toml @@ -19,7 +19,7 @@ #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:.*", 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 # ] # @@ -34,9 +34,9 @@ #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 + # "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 = [] diff --git a/config/fancymenu/options.txt b/config/fancymenu/options.txt index 317a601e3..00ba655f9 100644 --- a/config/fancymenu/options.txt +++ b/config/fancymenu/options.txt @@ -14,7 +14,6 @@ B:advanced_customization_mode = 'false'; ##[loading] -B:preload_animations = 'true'; S:preload_resources = '[cubic_panorama]beneath%!source_end!%[slideshow]new_loading_screen%!source_end!%'; S:custom_game_intro_skip_text = ''; B:allow_game_intro_skip = 'true'; @@ -85,4 +84,10 @@ B:show_welcome_screen = 'false'; ##[keyframe_editor] -B:arrow_keys_move_preview = 'false'; \ No newline at end of file +B:arrow_keys_move_preview = 'false'; + + +##[advanced] + +L:placeholder_caching_duration_ms = '30'; +L:requirement_caching_duration_ms = '0'; \ No newline at end of file diff --git a/config/tfg-client.toml b/config/tfg-client.toml new file mode 100644 index 000000000..cfae85505 --- /dev/null +++ b/config/tfg-client.toml @@ -0,0 +1,8 @@ + +[propick_vein_rendering] + # + # + #1 in N chance for the precise xray ore prospector particles to appear per block. Set to 0 to disable. Default: 5 + #Range: 0 ~ 1000 + PreciseOreProspectorParticleChance = 5 + diff --git a/config/tfg-common.toml b/config/tfg-common.toml index 58a16f7ed..235020b09 100644 --- a/config/tfg-common.toml +++ b/config/tfg-common.toml @@ -1,5 +1,7 @@ -#Should be create compat enabled? -createCompat = true -#Should be tfc ambiental compat enabled? -tfcAmbientalCompat = true + +[general] + #Should be create compat enabled? + createCompat = true + #Should be tfc ambiental compat enabled? + tfcAmbientalCompat = true