From 49a7221e6a80047a6817718dab079c14d9b0595c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 15:40:55 +0700 Subject: [PATCH 01/17] start --- .gitignore | 14 +----------- ....properties => canary.properties.disabled} | 0 config/fastbench.cfg | 2 +- config/immediatelyfast.json | 22 +++++++++++++++++++ config/lithium.properties | 7 ++++++ config/modelfix-client.toml | 21 ++++++++++++++++++ config/roughlyenoughitems/config.json5 | 8 ++----- config/rrls.toml | 8 +++++++ mods | 2 +- 9 files changed, 63 insertions(+), 21 deletions(-) rename config/{canary.properties => canary.properties.disabled} (100%) create mode 100644 config/immediatelyfast.json create mode 100644 config/lithium.properties create mode 100644 config/modelfix-client.toml create mode 100644 config/rrls.toml diff --git a/.gitignore b/.gitignore index dca95e16a..724e96666 100644 --- a/.gitignore +++ b/.gitignore @@ -59,16 +59,4 @@ knownkeys.txt # Server Pack -.github/buildtools/serverpack/logs/ -.github/buildtools/serverpack/world/ -.github/buildtools/serverpack/config/ -.github/buildtools/serverpack/crash-reports/ -.github/buildtools/serverpack/kubejs/ -.github/buildtools/serverpack/mods/ -.github/buildtools/serverpack/local/ -.github/buildtools/serverpack/xaerominimap-common.txt -.github/buildtools/serverpack/xaeroworldmap-common.txt -.github/buildtools/serverpack/banned-ips.json -.github/buildtools/serverpack/banned-players.json -.github/buildtools/serverpack/ops.json -.github/buildtools/serverpack/whitelist.json \ No newline at end of file +.github/buildtools/serverpack/* \ No newline at end of file diff --git a/config/canary.properties b/config/canary.properties.disabled similarity index 100% rename from config/canary.properties rename to config/canary.properties.disabled diff --git a/config/fastbench.cfg b/config/fastbench.cfg index 8f774c528..42c93bcec 100644 --- a/config/fastbench.cfg +++ b/config/fastbench.cfg @@ -5,7 +5,7 @@ general { # If the recipe book button is removed. # Default: true - B:"Remove Recipe Book Button"=true + B:"Remove Recipe Book Button"=false # If the crafting table has a tooltip # Default: false diff --git a/config/immediatelyfast.json b/config/immediatelyfast.json new file mode 100644 index 000000000..b34da085c --- /dev/null +++ b/config/immediatelyfast.json @@ -0,0 +1,22 @@ +{ + "REGULAR_INFO": "----- Regular config values below -----", + "font_atlas_resizing": true, + "map_atlas_generation": true, + "hud_batching": true, + "fast_text_lookup": true, + "fast_buffer_upload": true, + "fast_buffer_upload_size_mb": 256, + "fast_buffer_upload_explicit_flush": true, + "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----", + "dont_add_info_into_debug_hud": false, + "EXPERIMENTAL_INFO": "----- Experimental config values below (Rendering glitches may occur) -----", + "experimental_disable_error_checking": false, + "experimental_disable_resource_pack_conflict_handling": false, + "experimental_sign_text_buffering": false, + "experimental_screen_batching": false, + "DEBUG_INFO": "----- Debug only config values below (Do not touch) -----", + "debug_only_and_not_recommended_disable_universal_batching": false, + "debug_only_and_not_recommended_disable_mod_conflict_handling": false, + "debug_only_and_not_recommended_disable_hardware_conflict_handling": false, + "debug_only_print_additional_error_information": false +} \ No newline at end of file diff --git a/config/lithium.properties b/config/lithium.properties new file mode 100644 index 000000000..d276f4036 --- /dev/null +++ b/config/lithium.properties @@ -0,0 +1,7 @@ +# This is the configuration file for Radium. +# This file exists for debugging purposes and should not be configured otherwise. +# +# You can find information on editing this file and all the available options here: +# https://github.com/jellysquid3/lithium-fabric/wiki/Configuration-File +# +# By default, this file will be empty except for this notice. diff --git a/config/modelfix-client.toml b/config/modelfix-client.toml new file mode 100644 index 000000000..cfac1c8d1 --- /dev/null +++ b/config/modelfix-client.toml @@ -0,0 +1,21 @@ + +[default] + #quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible + #Range: -0.1 ~ 0.1 + item_quad_expansion = 0.008 + #quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps + #Range: -0.1 ~ 0.1 + item_quad_indent = 0.007 + +[mac_os] + #It has been reported that some mac os systems are affected by atlass bleeding so the mod cant apply its main fix by removing atlas shrinking. Instead it can reduce it as much as possible by multiplying it by shrink_value_multiplier + #quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible + #Range: -0.1 ~ 0.1 + item_quad_expansion = 0.04 + #quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps + #Range: -0.1 ~ 0.1 + item_quad_indent = 0.0099 + #set to 0 for non macos behavior. 1 keeps vanilla behavior to prevent atlas bleeding + #Range: 0.0 ~ 1.0 + shrink_ratio_multiplier = 1.0 + diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index ed9c1f67a..5ccd43f15 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -1,10 +1,6 @@ { "basics": { - "favorites": [ - "{id:\"ftbteams:my_team\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbteams:textures/teams.png\",\"x\":0,\"click\":\"ftbteams:open_gui\",\"loading_screen\":true}',type:\"ftblibrary:sidebar_button\"}", - "{id:\"ftbquests:quests\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbquests:item/book\",\"x\":610,\"click\":\"ftbquests:open_gui\",\"required_server_mods\":[\"ftbquests\"],\"custom_text\":true}',type:\"ftblibrary:sidebar_button\"}", - "{id:\"ftbessentials:trash_can\",json:'{\"group\":\"ftblibrary:util\",\"icon\":\"ftblibrary:icons/bin\",\"x\":150,\"click\":\"command:/trashcan\",\"required_server_mods\":[\"ftbessentials\"]}',type:\"ftblibrary:sidebar_button\"}" - ], + "favorites": [], "hiddenFavorites": [], "displayHistory": [], // Declares whether cheating mode is on. @@ -163,7 +159,7 @@ "functionality": { "inputMethod": null, // Declares whether REI should remove the recipe book. - "disableRecipeBook": true, + "disableRecipeBook": false, // Declares whether mob effects should be on the left side instead of the right side. "leftSideMobEffects": true, // Declares whether subsets is enabled. diff --git a/config/rrls.toml b/config/rrls.toml new file mode 100644 index 000000000..cd2e12af6 --- /dev/null +++ b/config/rrls.toml @@ -0,0 +1,8 @@ +enabled = true +rgbProgress = false +loadingScreenHide = false +showIn = "ALL" +type = "PROGRESS" +reloadText = "" +resetResources = false +reInitScreen = true diff --git a/mods b/mods index 7fa418ec2..68387e1cd 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 7fa418ec236ef30e269c406b6f0587c90f8ef2b2 +Subproject commit 68387e1cd2f090131538bc9e53fc011c13a341ef From fbf27ece022b1f8e7bd43bcbc3e196e06ab60a36 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 16:44:02 +0700 Subject: [PATCH 02/17] a lot of shit configs --- config/InventoryHUD/curios.json | 101 ++++- config/canary.properties.disabled | 11 - config/connectivity.json | 34 -- config/emi.css | 462 ---------------------- config/extendedcrafting-client.toml | 6 - config/extendedcrafting-common.toml | 110 ------ config/ftbxmodcompat.snbt | 13 - config/jei/blacklist.cfg | 0 config/jei/jei-client.ini | 141 ------- config/jei/jei-colors.ini | 8 - config/jei/jei-debug.ini | 12 - config/jei/jei-mod-id-format.ini | 11 - config/jei/recipe-category-sort-order.ini | 83 ---- config/lithium.properties | 3 + config/railways-common.toml | 2 +- config/roughlyenoughitems/config.json5 | 3 +- config/serverconfigupdater-common.toml | 12 - 17 files changed, 105 insertions(+), 907 deletions(-) delete mode 100644 config/canary.properties.disabled delete mode 100644 config/connectivity.json delete mode 100644 config/emi.css delete mode 100644 config/extendedcrafting-client.toml delete mode 100644 config/extendedcrafting-common.toml delete mode 100644 config/ftbxmodcompat.snbt delete mode 100644 config/jei/blacklist.cfg delete mode 100644 config/jei/jei-client.ini delete mode 100644 config/jei/jei-colors.ini delete mode 100644 config/jei/jei-debug.ini delete mode 100644 config/jei/jei-mod-id-format.ini delete mode 100644 config/jei/recipe-category-sort-order.ini delete mode 100644 config/serverconfigupdater-common.toml diff --git a/config/InventoryHUD/curios.json b/config/InventoryHUD/curios.json index 2ae8170cd..8c5a8c9f9 100644 --- a/config/InventoryHUD/curios.json +++ b/config/InventoryHUD/curios.json @@ -1 +1,100 @@ -{"clothes_hat":{"x":20,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"hands":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"TOP"},"belt":{"x":2,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"ring":{"x":2,"y":117,"enabled":true,"halign":"LEFT","valign":"TOP"},"back":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"bracelet":{"x":2,"y":-3,"enabled":true,"halign":"LEFT","valign":"CENTER"},"necklace":{"x":2,"y":146,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"body":{"x":2,"y":126,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_torso":{"x":20,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":2,"y":136,"enabled":true,"halign":"LEFT","valign":"TOP"},"head":{"x":2,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"charm":{"x":2,"y":99,"enabled":true,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":20,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_socks":{"x":20,"y":44,"enabled":true,"halign":"LEFT","valign":"BOTTOM"}} \ No newline at end of file +{ + "clothes_hat": { + "x": 20, + "y": 98, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "hands": { + "x": 2, + "y": 80, + "enabled": true, + "halign": "LEFT", + "valign": "TOP" + }, + "belt": { + "x": 2, + "y": 62, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "ring": { + "x": 2, + "y": 117, + "enabled": true, + "halign": "LEFT", + "valign": "TOP" + }, + "back": { + "x": 2, + "y": 80, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "bracelet": { + "x": 2, + "y": -3, + "enabled": true, + "halign": "LEFT", + "valign": "CENTER" + }, + "necklace": { + "x": 2, + "y": 146, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "body": { + "x": 2, + "y": 126, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "clothes_torso": { + "x": 20, + "y": 80, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "curio": { + "x": 2, + "y": 136, + "enabled": true, + "halign": "LEFT", + "valign": "TOP" + }, + "head": { + "x": 2, + "y": 98, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "charm": { + "x": 2, + "y": 99, + "enabled": true, + "halign": "LEFT", + "valign": "TOP" + }, + "clothes_pants": { + "x": 20, + "y": 62, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + }, + "clothes_socks": { + "x": 20, + "y": 44, + "enabled": true, + "halign": "LEFT", + "valign": "BOTTOM" + } +} diff --git a/config/canary.properties.disabled b/config/canary.properties.disabled deleted file mode 100644 index 71f4ebb86..000000000 --- a/config/canary.properties.disabled +++ /dev/null @@ -1,11 +0,0 @@ -# This is the configuration file for Canary. -# This file exists for debugging purposes and should not be configured otherwise. -# Before configuring anything, take a backup of the worlds that will be opened. -# -# You can find information on editing this file and all the available options here: -# https://github.com/AbdElAziz333/Canary/wiki/Configuration-File -# -# By default, this file will be empty except for this notice. - -mixin.world.player_chunk_tick=false -mixin.entity.collisions=false \ No newline at end of file diff --git a/config/connectivity.json b/config/connectivity.json deleted file mode 100644 index 9e09e71af..000000000 --- a/config/connectivity.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "disableLoginLimits": { - "desc:": "Should login packet size limits be disabled? Error:(IOException(\"Payload may not be larger than 1048576 bytes\")) default:true", - "disableLoginLimits": true - }, - "disablePacketLimits": { - "desc:": "Should play packet size limits be disabled? Error:(Badly compressed packet) default:true", - "disablePacketLimits": true - }, - "disableChatVerificationDisconnect": { - "desc:": "(Clientside) Disables players disconnecting on chat message verification problems,(enable debugPrintMessages to see the message causing issues). default:true", - "disableChatVerificationDisconnect": true - }, - "debugPrintMessages": { - "desc:": "Enable addition debug logging for networking errors. default:false", - "debugPrintMessages": false - }, - "logintimeout": { - "desc:": "Set the max login timeout in seconds. default = 120", - "logintimeout": 2400 - }, - "disconnectTimeout": { - "desc:": "Set the ingame disconnect timeout for disconnecting players. Default = 60sec", - "disconnectTimeout": 60 - }, - "packetHistoryMinutes": { - "desc:": "Set the amount of minutes for which network packet history data is saved. Default = 5 minutes", - "packetHistoryMinutes": 5 - }, - "showFullResourceLocationException": { - "desc:": "Enable to see the full log output for all resource location exceptions. Default = false", - "showFullResourceLocationException": false - } -} \ No newline at end of file diff --git a/config/emi.css b/config/emi.css deleted file mode 100644 index c9c121dd5..000000000 --- a/config/emi.css +++ /dev/null @@ -1,462 +0,0 @@ -/** EMI Config */ - -#general { - /** - * Whether EMI is enabled and visible. - */ - enabled: true; - - /** - * Whether cheating in items is enabled. - */ - cheat-mode: true; - - /** - * How much EMI should use tooltips and popups to show controls and information. - */ - help-level: normal; - - /** - * Where EMI should pull stacks from to populate the index. - */ - index-source: creative; - - /** - * Whether normal search queries should include the tooltip. - */ - search-tooltip-by-default: true; - - /** - * Whether normal search queries should include the mod name. - */ - search-mod-name-by-default: false; - - /** - * Whether normal search queries should include the stack's tags. - */ - search-tags-by-default: false; -} - -#ui { - /** - * Which action should be performed when clicking the recipe book. - */ - recipe-book-action: toggle-craftables; - - /** - * Where to display status effects in the inventory. - */ - effect-location: top; - - /** - * Whether to display a gray overlay when hovering over a stack. - */ - show-hover-overlay: true; - - /** - * Whether to add mod name to tooltips - */ - append-mod-id: true; - - /** - * Whether to add mod name to item tooltips, in case another mod provides behavior - */ - append-item-mod-id: true; - - /** - * Prevents recipes being quick crafted from shifting around under the cursor. - */ - miscraft-prevention: true; - - /** - * The unit to display fluids as. - */ - fluid-unit: millibuckets; - - /** - * Whether to use the batched render system. Batching is faster, but may have - * incompatibilities with shaders or other mods. - */ - use-batched-renderer: true; - - /** - * Whether to have the search bar in the center of the screen, instead of to the - * side. - */ - center-search-bar: true; - - /** - * Which sidebar type to switch to when searching. - */ - search-sidebar-focus: index; - - /** - * Which sidebar type to focus when the search is empty. - */ - empty-search-sidebar-focus: none; - - /** - * The amount of vertical margin to give in the recipe screen. - */ - vertical-margin: 20; - - /** - * The minimum width of the recipe screen in pixels. Controls how many tabs there - * can be, and where the page switching buttons go. The default is 176, the width - * of most screens. - */ - minimum-recipe-screen-width: 176; - - /** - * Where to show workstations in the recipe screen - */ - workstation-location: bottom; - - /** - * Display cost per batch when hovering a recipe output - */ - show-cost-per-batch: true; - - /** - * Whether recipes should have a button to set as default. - */ - recipe-default-button: true; - - /** - * Whether recipes should have a button to show the recipe tree. - */ - recipe-tree-button: true; - - /** - * Whether recipes should have a button to fill the ingredients in a handler. - */ - recipe-fill-button: true; - - /** - * Whether recipes should have a button to take a screenshot of the recipe. - */ - recipe-screenshot-button: false; - - /** - * The GUI scale at which recipe screenshots are saved. Use 0 to use the current - * GUI scale. - */ - recipe-screenshot-scale: 0; - - /** - * The pages in the left sidebar - */ - left-sidebar-pages: favorites; - - /** - * The subpanels in the left sidebar - */ - left-sidebar-subpanels: none; - - /** - * How many columns and rows of ingredients to limit the left sidebar to - */ - left-sidebar-size: 12, 100; - - /** - * How much space to maintain between the left sidebar and obstructions, in pixels - */ - left-sidebar-margins: 2, 2, 2, 2; - - /** - * Where to position the left sidebar - */ - left-sidebar-align: left, top; - - /** - * Whether to render the header buttons and page count for the left sidebar - */ - left-sidebar-header: visible; - - /** - * Which theme to use for the left sidebar - */ - left-sidebar-theme: transparent; - - /** - * The pages in the right sidebar - */ - right-sidebar-pages: index, craftables; - - /** - * The subpanels in the right sidebar - */ - right-sidebar-subpanels: none; - - /** - * How many columns and rows of ingredients to limit the right sidebar to - */ - right-sidebar-size: 12, 100; - - /** - * How much space to maintain between the right sidebar and obstructions, in pixels - */ - right-sidebar-margins: 2, 2, 2, 2; - - /** - * Where to position the right sidebar - */ - right-sidebar-align: right, top; - - /** - * Whether to render the header buttons and page count for the right sidebar - */ - right-sidebar-header: visible; - - /** - * Which theme to use for the right sidebar - */ - right-sidebar-theme: transparent; - - /** - * The pages in the top sidebar - */ - top-sidebar-pages: none; - - /** - * The subpanels in the top sidebar - */ - top-sidebar-subpanels: none; - - /** - * How many columns and rows of ingredients to limit the top sidebar to - */ - top-sidebar-size: 9, 9; - - /** - * How much space to maintain between the top sidebar and obstructions, in pixels - */ - top-sidebar-margins: 2, 2, 2, 2; - - /** - * Where to position the top sidebar - */ - top-sidebar-align: center, center; - - /** - * Whether to render the header buttons and page count for the top sidebar - */ - top-sidebar-header: visible; - - /** - * Which theme to use for the top sidebar - */ - top-sidebar-theme: transparent; - - /** - * The pages in the bottom sidebar - */ - bottom-sidebar-pages: none; - - /** - * The subpanels in the bottom sidebar - */ - bottom-sidebar-subpanels: none; - - /** - * How many columns and rows of ingredients to limit the bottom sidebar to - */ - bottom-sidebar-size: 9, 9; - - /** - * How much space to maintain between the bottom sidebar and obstructions, in - * pixels - */ - bottom-sidebar-margins: 2, 2, 2, 2; - - /** - * Where to position the bottom sidebar - */ - bottom-sidebar-align: center, center; - - /** - * Whether to render the header buttons and page count for the bottom sidebar - */ - bottom-sidebar-header: visible; - - /** - * Which theme to use for the bottom sidebar - */ - bottom-sidebar-theme: transparent; -} - -#binds { - /** - * Toggle the visibility of EMI. - */ - toggle-visibility: "ctrl key.keyboard.o"; - - /** - * Focuse the search bar. - */ - focus-search: "ctrl key.keyboard.f"; - - /** - * Clears the search bar. - */ - clear-search: "key.keyboard.unknown"; - - /** - * Display the recipes for creating a stack. - */ - view-recipes: "key.keyboard.r"; - view-recipes: "key.mouse.left"; - - /** - * Display the recipes that can be created using a stack. - */ - view-uses: "key.keyboard.u"; - view-uses: "key.mouse.right"; - - /** - * Favorite the item to display on the side of the screen opposite of recipies for - * quick access. - */ - favorite: "key.keyboard.a"; - - /** - * Set the default recipe for a given stack in the output of a recipe to that - * recipe. - */ - default-stack: "ctrl key.mouse.left"; - - /** - * Display the recipe tree for a given stack. - */ - view-stack-tree: "key.keyboard.unknown"; - - /** - * Display the recipe tree. - */ - view-tree: "key.keyboard.unknown"; - - /** - * Return to the previous page in EMI. - */ - back: "key.keyboard.backspace"; - - /** - * Return to the next page in EMI after going back. - */ - forward: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result. - */ - craft-one: "key.mouse.left"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for as many results as possible. - */ - craft-all: "shift key.mouse.left"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result and put in inventory if possible. - */ - craft-one-to-inventory: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for as many results as possible and put in inventory if - * possible. - */ - craft-all-to-inventory: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result and put in cursor if possible. - */ - craft-one-to-cursor: "ctrl key.mouse.left"; - - /** - * Display the recipe that will be used to craft on a stack with no recipe context. - */ - show-craft: "key.keyboard.left.shift"; - - /** - * Cheat in one of an item into the inventory. - */ - cheat-one-to-inventory: "ctrl key.mouse.right"; - - /** - * Cheat in a stack of an item into the inventory. - */ - cheat-stack-to-inventory: "ctrl key.mouse.left"; - - /** - * Cheat in one of an item into the cursor. - */ - cheat-one-to-cursor: "ctrl key.mouse.middle"; - - /** - * Cheat in a stack of an item into the cursor. - */ - cheat-stack-to-cursor: "key.keyboard.unknown"; - - /** - * Delete the stack in the cursor when hovering the index - */ - delete-cursor-stack: "key.mouse.left"; - - /** - * Copies the hovered recipe's ID to the clipboard - */ - copy-recipe-id: "key.keyboard.keypad.5"; - - /** - * In edit mode, hide the hovered stack - */ - hide-stack: "ctrl key.mouse.left"; - - /** - * In edit mode, hide stacks with the hovered stack's id - */ - hide-stack-by-id: "ctrl shift key.mouse.left"; -} - -#dev { - /** - * Whether development functions should be enabled. Not recommended for general - * play. - */ - dev-mode: false; - - /** - * Whether editing the index is enabled - */ - edit-mode: false; - - /** - * Whether to log untranslated tags as warnings. - */ - log-untranslated-tags: false; - - /** - * Whether to log ingredients that don't have a representative tag as warnings. - */ - log-non-tag-ingredients: false; - - /** - * Whether hovering the output of a recipe should show the recipe's EMI ID. - */ - show-recipe-ids: true; - - /** - * Whether stacks in the index should display a highlight if they have a recipe - * default. - */ - highlight-defaulted: false; - - /** - * Whether to display exclusion areas - */ - highlight-exclusion-areas: false; -} diff --git a/config/extendedcrafting-client.toml b/config/extendedcrafting-client.toml deleted file mode 100644 index 62a78ad88..000000000 --- a/config/extendedcrafting-client.toml +++ /dev/null @@ -1,6 +0,0 @@ - -#Client settings. -[General] - #Should the Quantum Compressor render the result item above it? - enableCompressorRenderer = true - diff --git a/config/extendedcrafting-common.toml b/config/extendedcrafting-common.toml deleted file mode 100644 index c2f29c31b..000000000 --- a/config/extendedcrafting-common.toml +++ /dev/null @@ -1,110 +0,0 @@ - -#Settings for Singularities. -[Singularities] - #Should the default recipe for the Ultimate Singularity be generated? - ultimateSingularityRecipe = true - #The default amount of items required to create a Singularity. - #Range: > 1 - defaultMaterialsRequired = 10000 - #Should default recipes be generated for Singularities? - defaultRecipes = true - #The default amount of FE required to create a Singularity. - #Range: > 0 - defaultPowerRequired = 5000000 - #Should the Singularities be enabled? - enabled = true - #The item to use as the Catalyst in default Singularity recipes. - defaultCatalyst = "extendedcrafting:ultimate_catalyst" - -#Settings for the Crafting Core. -["Combination Crafting"] - #How much FE the Crafting Core should hold. - #Range: > 0 - powerCapacity = 5000000 - #How much FE/t the Crafting Core should use when crafting by default. - #Range: > 0 - powerRate = 500 - #Should the Crafting Core be enabled? - enabled = true - -#Settings for general things. -[General] - #Should the Handheld Crafting Table be enabled? - handheldWorkbench = true - -#Settings for the Extended Crafting Tables. -["Table Crafting"] - #How much FE the Auto Crafting Tables should hold. Higher tiers use double the previous tier. - #Range: > 0 - autoTablePowerCapacity = 500000 - #How much FE the Auto Crafting Tables should use when auto inserting items. - #Range: > 0 - autoTableInsertPowerRate = 100 - #Should the Basic Crafting Table inherit vanilla crafting recipes? - useVanillaRecipes = true - #Should the Extended Crafting Tables be enabled? - enabled = true - #Should the Auto Crafting Tables be enabled? - autoTablesEnabled = true - #How much FE the Auto Crafting Tables should use when crafting. - #Range: > 0 - autoTablePowerRate = 500 - -#Settings for the Quantum Compressor. -["Quantum Compression"] - #How much FE the Quantum Compressor should hold. - #Range: > 0 - powerCapacity = 10000000 - #How much FE/t the Quantum Compressor should use when crafting by default. - #Range: > 0 - powerRate = 5000 - #Should the Quantum Compressor be enabled? - enabled = true - -#Settings for the Recipe Maker. -["Recipe Maker"] - #Should the recipe maker add NBT tags when possible? - useNBT = true - #Should the recipe maker try to use tags when possible? - useTags = false - #Should the Recipe Maker be enabled? - enabled = true - -#Settings for the Flux Crafter. -["Flux Crafting"] - #How much FE/t the Flux Crafter should pull from each Flux Alternator when crafting by default. - #Range: > 0 - defaultPowerRate = 400 - #How much FE the Flux Alternator should hold. - #Range: > 0 - powerCapacity = 80000 - #How much FE the Auto Flux Crafter should hold. - #Range: > 0 - autoCrafterPowerCapacity = 500000 - #How much FE the Auto Flux Crafter should use when auto inserting items. - #Range: > 0 - autoCrafterInsertPowerRate = 100 - #Should the Flux Crafter be enabled? - enabled = true - #Should the Auto Flux Crafter be enabled? - autoCrafterEnabled = true - -#Settings for the Ender Crafter. -["Ender Crafting"] - #How long a single Ender Crafter crafting operation should take (in seconds) by default. - #Range: > 1 - defaultTimeRequired = 60 - #How much FE the Auto Ender Crafter should hold. - #Range: > 0 - autoCrafterPowerCapacity = 500000 - #How much FE the Auto Ender Crafter should use when auto inserting items. - #Range: > 0 - autoCrafterInsertPowerRate = 100 - #How much a single Ender Alternator should speed up a craft. This is a percentage of the time required. - #Range: 0.0 ~ 1.0 - alternatorEffectiveness = 0.01 - #Should the Ender Crafter be enabled? - enabled = true - #Should the Auto Ender Crafter be enabled? - autoCrafterEnabled = true - diff --git a/config/ftbxmodcompat.snbt b/config/ftbxmodcompat.snbt deleted file mode 100644 index 89bc0f314..000000000 --- a/config/ftbxmodcompat.snbt +++ /dev/null @@ -1,13 +0,0 @@ -{ - # Select the permissions implementation to use - # DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability - # Default: "default" - # Valid values: "default", "ftb_ranks", "luckperms" - permission_selector: "default" - - # Select the game stages implementation to use - # DEFAULT: use KubeJS, Game Stages, vanilla in preference order, depending on mod availability - # Default: "default" - # Valid values: "default", "vanilla", "kubejs", "gamestages" - stage_selector: "default" -} diff --git a/config/jei/blacklist.cfg b/config/jei/blacklist.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/jei/jei-client.ini b/config/jei/jei-client.ini deleted file mode 100644 index 2146509c9..000000000 --- a/config/jei/jei-client.ini +++ /dev/null @@ -1,141 +0,0 @@ -[advanced] - # Description: Display search bar in the center - # Valid Values: [true, false] - # Default Value: false - CenterSearch = false - - # Description: Set low-memory mode (makes search very slow, but uses less RAM) - # Valid Values: [true, false] - # Default Value: false - LowMemorySlowSearchEnabled = false - - # Description: Enable cheating items into the hotbar by using the shift+number keys. - # Valid Values: [true, false] - # Default Value: false - CheatToHotbarUsingHotkeysEnabled = false - - # Description: Enable adding new bookmarks to the front of the bookmark list. - # Valid Values: [true, false] - # Default Value: true - AddBookmarksToFrontEnabled = true - - # Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids. - # Valid Values: [true, false] - # Default Value: false - LookupFluidContents = false - - # Description: How items should be handed to you - # Valid Values: [INVENTORY, MOUSE_PICKUP] - # Default Value: MOUSE_PICKUP - GiveMode = MOUSE_PICKUP - - # Description: Max. recipe gui height - # Valid Values: Any integer greater than or equal to 175 - # Default Value: 350 - RecipeGuiHeight = 350 - - -[sorting] - # Description: Sorting order for the ingredient list - # Valid Values: A comma-separated list containing values of: - # [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY] - # Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU - IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU - - -[search] - # Description: Search mode for Mod Names (prefix: @) - # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] - # Default Value: REQUIRE_PREFIX - ModNameSearchMode = REQUIRE_PREFIX - - # Description: Search mode for Tooltips (prefix: #) - # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] - # Default Value: ENABLED - TooltipSearchMode = ENABLED - - # Description: Search mode for Tag Names (prefix: $) - # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] - # Default Value: REQUIRE_PREFIX - TagSearchMode = REQUIRE_PREFIX - - # Description: Search mode for Colors (prefix: ^) - # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] - # Default Value: DISABLED - ColorSearchMode = DISABLED - - # Description: Search mode for resources locations (prefix: &) - # Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED] - # Default Value: DISABLED - ResourceLocationSearchMode = DISABLED - - # Description: Search advanced tooltips (visible with F3+H) - # Valid Values: [true, false] - # Default Value: false - SearchAdvancedTooltips = false - - -[IngredientList] - # Description: Max number of rows shown - # Valid Values: An integer in the range [1, 100] (inclusive) - # Default Value: 16 - MaxRows = 16 - - # Description: Max number of columns shown - # Valid Values: An integer in the range [4, 100] (inclusive) - # Default Value: 9 - MaxColumns = 9 - - # Description: Horizontal alignment of the ingredient grid inside the available area - # Valid Values: [LEFT, CENTER, RIGHT] - # Default Value: RIGHT - HorizontalAlignment = RIGHT - - # Description: Vertical alignment of the ingredient grid inside the available area - # Valid Values: [TOP, CENTER, BOTTOM] - # Default Value: TOP - VerticalAlignment = TOP - - # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. - # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] - # Default Value: ENABLED - ButtonNavigationVisibility = ENABLED - - # Description: Set to true to draw a background texture behind the gui. - # Valid Values: [true, false] - # Default Value: false - DrawBackground = false - - -[BookmarkList] - # Description: Max number of rows shown - # Valid Values: An integer in the range [1, 100] (inclusive) - # Default Value: 16 - MaxRows = 16 - - # Description: Max number of columns shown - # Valid Values: An integer in the range [4, 100] (inclusive) - # Default Value: 9 - MaxColumns = 9 - - # Description: Horizontal alignment of the ingredient grid inside the available area - # Valid Values: [LEFT, CENTER, RIGHT] - # Default Value: LEFT - HorizontalAlignment = LEFT - - # Description: Vertical alignment of the ingredient grid inside the available area - # Valid Values: [TOP, CENTER, BOTTOM] - # Default Value: TOP - VerticalAlignment = TOP - - # Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages. - # Valid Values: [ENABLED, AUTO_HIDE, DISABLED] - # Default Value: ENABLED - ButtonNavigationVisibility = ENABLED - - # Description: Set to true to draw a background texture behind the gui. - # Valid Values: [true, false] - # Default Value: false - DrawBackground = false - - diff --git a/config/jei/jei-colors.ini b/config/jei/jei-colors.ini deleted file mode 100644 index 1fc7da4ea..000000000 --- a/config/jei/jei-colors.ini +++ /dev/null @@ -1,8 +0,0 @@ -[colors] - # Description: Color values to search for - # Valid Values: A comma-separated list containing values of: - # Any color name and an RGB hex color, separated by a ':' - # Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 - SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0 - - diff --git a/config/jei/jei-debug.ini b/config/jei/jei-debug.ini deleted file mode 100644 index 89c6b8f5f..000000000 --- a/config/jei/jei-debug.ini +++ /dev/null @@ -1,12 +0,0 @@ -[debug] - # Description: Debug mode enabled - # Valid Values: [true, false] - # Default Value: false - DebugMode = false - - # Description: Debug inputs enabled - # Valid Values: [true, false] - # Default Value: false - DebugInputs = false - - diff --git a/config/jei/jei-mod-id-format.ini b/config/jei/jei-mod-id-format.ini deleted file mode 100644 index 05234a802..000000000 --- a/config/jei/jei-mod-id-format.ini +++ /dev/null @@ -1,11 +0,0 @@ -[modname] - # Description: Formatting for mod name tooltip - # Valid Values: A chat formatting string. - # Use these formatting colors: - # black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white - # With these formatting options: - # obfuscated bold strikethrough underline italic - # Default Value: blue italic - ModNameFormat = blue italic - - diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini deleted file mode 100644 index 08cc437f2..000000000 --- a/config/jei/recipe-category-sort-order.ini +++ /dev/null @@ -1,83 +0,0 @@ -minecraft:crafting -minecraft:anvil -minecraft:blasting -minecraft:brewing -minecraft:campfire -minecraft:compostable -minecraft:fuel -minecraft:furnace -minecraft:smithing -minecraft:smoking -minecraft:stonecutting -ae2:attunement -ae2:certus_growth -ae2:charger -ae2:condenser -ae2:entropy -ae2:inscriber -ae2:item_transformation -create:automatic_brewing -create:automatic_packing -create:automatic_shaped -create:automatic_shapeless -create:block_cutting -create:crushing -create:deploying -create:draining -create:fan_blasting -create:fan_haunting -create:fan_smoking -create:fan_washing -create:item_application -create:mechanical_crafting -create:milling -create:mixing -create:mystery_conversion -create:packing -create:pressing -create:sandpaper_polishing -create:sawing -create:sequenced_assembly -create:spout_filling -create:wood_cutting -createaddition:charging -createaddition:liquid_burning -createaddition:rolling -exposure:photograph_printing -exposure:photograph_stacking -firmalife:drying -firmalife:mixing_bowl -firmalife:oven -firmalife:smoking -firmalife:vat -ftbquests:loot_crate -ftbquests:quest -jei:information -jumbofurnace:jumbo_furnace_upgrade -jumbofurnace:jumbo_smelting -morered:soldering -tfc:alloying -tfc:anvil -tfc:blast_furnace -tfc:bloomery -tfc:casting -tfc:chisel -tfc:clay_knapping -tfc:fire_clay_knapping -tfc:glassworking -tfc:goat_horn_knapping -tfc:heating -tfc:instant_barrel -tfc:instant_fluid_barrel -tfc:jam_pot -tfc:leather_knapping -tfc:loom -tfc:pumpkin_knapping -tfc:quern -tfc:rock_knapping -tfc:scraping -tfc:sealed_barrel -tfc:simple_pot -tfc:soup_pot -tfc:welding -treetap:tap_extract diff --git a/config/lithium.properties b/config/lithium.properties index d276f4036..aa0f88dd2 100644 --- a/config/lithium.properties +++ b/config/lithium.properties @@ -5,3 +5,6 @@ # https://github.com/jellysquid3/lithium-fabric/wiki/Configuration-File # # By default, this file will be empty except for this notice. + +mixin.world.player_chunk_tick=false +mixin.entity.collisions=false \ No newline at end of file diff --git a/config/railways-common.toml b/config/railways-common.toml index 2845004a5..0edb4ba3e 100644 --- a/config/railways-common.toml +++ b/config/railways-common.toml @@ -5,5 +5,5 @@ registerMissingTracks = false #. #Disable Steam 'n' Rails datafixers. Do not enable this config if your world contains pre-Create 0.5.1 monobogeys, because then they will be destroyed #[@cui:RequiresReload:both] -disableDatafixer = false +disableDatafixer = true diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index 5ccd43f15..cb3f5473e 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,8 +60,7 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] diff --git a/config/serverconfigupdater-common.toml b/config/serverconfigupdater-common.toml deleted file mode 100644 index ff0b691b2..000000000 --- a/config/serverconfigupdater-common.toml +++ /dev/null @@ -1,12 +0,0 @@ - -["Version Configuration"] - # Define a version here. On world load the mod will look up the serverconfig version and reset all files that specified up to the newest version. - # Example: ["1=minecraft","2=forge"] will reset minecraft and forge config on first load, but will only reset forge if the world has been loaded before with only version 1 defined - versions = [""] - -["File Deleter"] - # This is intended for deleting files for pack updates. This is a last resort! Replace with empty files instead when possible. The file will be deleted every launch if it exists! Specify the path to the file. Comma Separated List. Example: scripts/badscript.zs - files = [""] - # By default Folders are only deleted if they are empty. Set to true to change that. - deleteFoldersWithContent = false - From 1ccd906fdb1993043d7b16709a35a49bb0fbdf71 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 16:49:19 +0700 Subject: [PATCH 03/17] Update config.json5 --- config/roughlyenoughitems/config.json5 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index cb3f5473e..a6dc8a1e5 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -4,7 +4,7 @@ "hiddenFavorites": [], "displayHistory": [], // Declares whether cheating mode is on. - "cheating": true, + "cheating": false, "favoritesEnabled": true, "keyBindings": { "recipeKeybind": { @@ -16,8 +16,8 @@ "modifier": 0 }, "hideKeybind": { - "keyCode": "key.keyboard.o", - "modifier": 2 + "keyCode": "key.keyboard.unknown", + "modifier": 0 }, "previousPageKeybind": { "keyCode": "key.keyboard.unknown", @@ -60,7 +60,8 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}", + "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] From 7da416a0c13ed3a715fd614d06c81277e182eade Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 16:58:09 +0700 Subject: [PATCH 04/17] configs --- config/embeddium++.toml | 2 +- config/jade/sort-order.json | 42 +------------------------- config/roughlyenoughitems/config.json5 | 3 +- mods | 2 +- 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/config/embeddium++.toml b/config/embeddium++.toml index 2cf342809..da6fc2ca8 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -82,7 +82,7 @@ onTileEntities = true #Configure how fast light whould be updated #Allowed Values: OFF, SLOW, NORMAL, FAST, SUPERFAST, FASTESTS, REALTIME - updateSpeed = "REALTIME" + updateSpeed = "NORMAL" #Toggle if Entities should have dynamic lights onEntities = true updateOnlyOnPositionChange = true diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 6fa827b56..4789d9a65 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -147,17 +147,6 @@ "tfc:windmill": null, "minecraft:campfire": null, "tfc:mold_table": null, - "corpse:corpse": null, - "create:blaze_burner": null, - "create:backtank_capacity": null, - "create:contraption_inv": null, - "lootr:inventory": null, - "create:hide_boiler_tanks": null, - "create:crafting_blueprint": null, - "create:placard": null, - "create:exact_block": null, - "create:filter": null, - "create:goggles": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -207,10 +196,6 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, @@ -255,30 +240,5 @@ "jade:registry_name": null, "jade:mod_name": null, "jade:distance": null, - "jade:block_face": null, - "ae2:server_data": null, - "ae2:charger": null, - "ae2:crafting_monitor": null, - "ae2:pattern_provider": null, - "ae2:power_storage": null, - "ae2:grid_node_state": null, - "ae2:debug": null, - "ae2:part_name": null, - "ae2:part_icon": null, - "ae2:part_tooltip": null, - "ae2:part_mod_name": null, - "treetap:tap": null, - "firmalife:drying_mat": null, - "firmalife:solar_drier": null, - "firmalife:string": null, - "firmalife:cheese": null, - "firmalife:oven_bottom": null, - "firmalife:oven_top": null, - "firmalife:shelf": null, - "firmalife:hanger": null, - "firmalife:vat": null, - "firmalife:tumbler": null, - "firmalife:fruit_tree_sapling": null, - "firmalife:jarbnet": null, - "tfc:mold_table": null + "jade:block_face": null } \ No newline at end of file diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index a6dc8a1e5..9a4874527 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,8 +60,7 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] diff --git a/mods b/mods index 68387e1cd..527421771 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 68387e1cd2f090131538bc9e53fc011c13a341ef +Subproject commit 52742177127fe7d745a996b22a009b655d304373 From 91a9b139d0c9e944be76430d9cbb2017ab0babc8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:04:22 +0700 Subject: [PATCH 05/17] back all mods --- config/roughlyenoughitems/config.json5 | 3 ++- mods | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index 9a4874527..a6dc8a1e5 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,7 +60,8 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}", + "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] diff --git a/mods b/mods index 527421771..f598d0665 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 52742177127fe7d745a996b22a009b655d304373 +Subproject commit f598d0665cc77fcdefdce1616f1c11625ab08ba3 From 50c18389fce11822dab402173b9fb02f114e6d15 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:17:26 +0700 Subject: [PATCH 06/17] a lot of shit --- config/InventoryHUD/curios.json | 101 +-------------- config/attributefix.json | 213 ++++++++++++++++++++++++++++++++ config/chat_heads.json5 | 7 ++ config/craftpresence.json | 2 +- config/firstperson.json | 8 +- config/ftbxmodcompat.snbt | 13 ++ config/jade/sort-order.json | 42 ++++++- mods | 2 +- 8 files changed, 279 insertions(+), 109 deletions(-) create mode 100644 config/attributefix.json create mode 100644 config/chat_heads.json5 create mode 100644 config/ftbxmodcompat.snbt diff --git a/config/InventoryHUD/curios.json b/config/InventoryHUD/curios.json index 8c5a8c9f9..2ae8170cd 100644 --- a/config/InventoryHUD/curios.json +++ b/config/InventoryHUD/curios.json @@ -1,100 +1 @@ -{ - "clothes_hat": { - "x": 20, - "y": 98, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "hands": { - "x": 2, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "belt": { - "x": 2, - "y": 62, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "ring": { - "x": 2, - "y": 117, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "back": { - "x": 2, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "bracelet": { - "x": 2, - "y": -3, - "enabled": true, - "halign": "LEFT", - "valign": "CENTER" - }, - "necklace": { - "x": 2, - "y": 146, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "body": { - "x": 2, - "y": 126, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "clothes_torso": { - "x": 20, - "y": 80, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "curio": { - "x": 2, - "y": 136, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "head": { - "x": 2, - "y": 98, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "charm": { - "x": 2, - "y": 99, - "enabled": true, - "halign": "LEFT", - "valign": "TOP" - }, - "clothes_pants": { - "x": 20, - "y": 62, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - }, - "clothes_socks": { - "x": 20, - "y": 44, - "enabled": true, - "halign": "LEFT", - "valign": "BOTTOM" - } -} +{"clothes_hat":{"x":20,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"hands":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"TOP"},"belt":{"x":2,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"ring":{"x":2,"y":117,"enabled":true,"halign":"LEFT","valign":"TOP"},"back":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"bracelet":{"x":2,"y":-3,"enabled":true,"halign":"LEFT","valign":"CENTER"},"necklace":{"x":2,"y":146,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"body":{"x":2,"y":126,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_torso":{"x":20,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":2,"y":136,"enabled":true,"halign":"LEFT","valign":"TOP"},"head":{"x":2,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"charm":{"x":2,"y":99,"enabled":true,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":20,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_socks":{"x":20,"y":44,"enabled":true,"halign":"LEFT","valign":"BOTTOM"}} \ No newline at end of file diff --git a/config/attributefix.json b/config/attributefix.json new file mode 100644 index 000000000..0861b66a8 --- /dev/null +++ b/config/attributefix.json @@ -0,0 +1,213 @@ +{ + "attributes": { + "forge:step_height_addition": { + "enabled": false, + "min": { + "default": -512, + "value": -512 + }, + "max": { + "default": 512, + "value": 512 + } + }, + "minecraft:generic.follow_range": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2048, + "value": 2048 + } + }, + "minecraft:generic.flying_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "forge:nametag_distance": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 64, + "value": 64 + } + }, + "minecraft:generic.movement_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "forge:entity_gravity": { + "enabled": false, + "min": { + "default": -8, + "value": -8 + }, + "max": { + "default": 8, + "value": 8 + } + }, + "forge:block_reach": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.max_health": { + "enabled": true, + "min": { + "default": 1, + "value": 1 + }, + "max": { + "default": 1024, + "value": 1000000 + } + }, + "minecraft:generic.attack_speed": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.attack_damage": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2048, + "value": 1000000 + } + }, + "minecraft:generic.luck": { + "enabled": true, + "min": { + "default": -1024, + "value": -1024 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:zombie.spawn_reinforcements": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1, + "value": 1 + } + }, + "minecraft:horse.jump_strength": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 2, + "value": 2 + } + }, + "minecraft:generic.attack_knockback": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 5, + "value": 1000000 + } + }, + "minecraft:generic.armor": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 30, + "value": 1000000 + } + }, + "forge:swim_speed": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + }, + "minecraft:generic.knockback_resistance": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1, + "value": 1 + } + }, + "minecraft:generic.armor_toughness": { + "enabled": true, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 20, + "value": 1000000 + } + }, + "forge:entity_reach": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1024, + "value": 1024 + } + } + } +} \ No newline at end of file diff --git a/config/chat_heads.json5 b/config/chat_heads.json5 new file mode 100644 index 000000000..0f74fb24e --- /dev/null +++ b/config/chat_heads.json5 @@ -0,0 +1,7 @@ +{ + "offsetNonPlayerText": true, + "senderDetection": "UUID_AND_HEURISTIC", + "smartHeuristics": true, + "handleSystemMessages": true, + "nameAliases": { } +} \ No newline at end of file diff --git a/config/craftpresence.json b/config/craftpresence.json index 147ae52ba..5c2bb7973 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -150,7 +150,7 @@ "stripTranslationColors": false, "stripExtraGuiElements": false, "renderTooltips": true, - "configKeyCode": -1 + "configKeyCode": 0 }, "displaySettings": { "presenceData": { diff --git a/config/firstperson.json b/config/firstperson.json index 564cb54c1..ace2fd0b4 100644 --- a/config/firstperson.json +++ b/config/firstperson.json @@ -1,4 +1,5 @@ { + "configVersion": 1, "enabledByDefault": false, "xOffset": 0, "sneakXOffset": 0, @@ -7,10 +8,5 @@ "vanillaHands": false, "doubleHands": false, "forceActive": false, - "autoVanillaHands": [ - "twilightforest:filled_ore_map", - "twilightforest:filled_magic_map", - "twilightforest:filled_maze_map", - "antiqueatlas:antique_atlas" - ] + "autoVanillaHands": [] } \ No newline at end of file diff --git a/config/ftbxmodcompat.snbt b/config/ftbxmodcompat.snbt new file mode 100644 index 000000000..08a06e500 --- /dev/null +++ b/config/ftbxmodcompat.snbt @@ -0,0 +1,13 @@ +{ + # Select the permissions implementation to use + # DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "ftb_ranks", "luckperms" + permission_selector: "ftb_ranks" + + # Select the game stages implementation to use + # DEFAULT: use KubeJS, Game Stages, vanilla in preference order, depending on mod availability + # Default: "default" + # Valid values: "default", "vanilla", "kubejs", "gamestages" + stage_selector: "kubejs" +} diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 4789d9a65..57218dc27 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -147,6 +147,21 @@ "tfc:windmill": null, "minecraft:campfire": null, "tfc:mold_table": null, + "corpse:corpse": null, + "create:blaze_burner": null, + "create:backtank_capacity": null, + "create:contraption_inv": null, + "lootr:inventory": null, + "create:hide_boiler_tanks": null, + "create:crafting_blueprint": null, + "create:placard": null, + "create:exact_block": null, + "create:filter": null, + "create:goggles": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -240,5 +255,30 @@ "jade:registry_name": null, "jade:mod_name": null, "jade:distance": null, - "jade:block_face": null + "jade:block_face": null, + "ae2:server_data": null, + "ae2:charger": null, + "ae2:crafting_monitor": null, + "ae2:pattern_provider": null, + "ae2:power_storage": null, + "ae2:grid_node_state": null, + "ae2:debug": null, + "ae2:part_name": null, + "ae2:part_icon": null, + "ae2:part_tooltip": null, + "ae2:part_mod_name": null, + "treetap:tap": null, + "firmalife:drying_mat": null, + "firmalife:solar_drier": null, + "firmalife:string": null, + "firmalife:cheese": null, + "firmalife:oven_bottom": null, + "firmalife:oven_top": null, + "firmalife:shelf": null, + "firmalife:hanger": null, + "firmalife:vat": null, + "firmalife:tumbler": null, + "firmalife:fruit_tree_sapling": null, + "firmalife:jarbnet": null, + "tfc:mold_table": null } \ No newline at end of file diff --git a/mods b/mods index f598d0665..c29603e16 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit f598d0665cc77fcdefdce1616f1c11625ab08ba3 +Subproject commit c29603e166d114b9f60a857367881a9cc5e9acad From b215b5565ad9ef1f7bf6f9f072d78090e352b055 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:20:23 +0700 Subject: [PATCH 07/17] ok.. --- config/firstperson.json | 1 - config/roughlyenoughitems/config.json5 | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/firstperson.json b/config/firstperson.json index ace2fd0b4..b5e2cbb20 100644 --- a/config/firstperson.json +++ b/config/firstperson.json @@ -7,6 +7,5 @@ "renderStuckFeatures": true, "vanillaHands": false, "doubleHands": false, - "forceActive": false, "autoVanillaHands": [] } \ No newline at end of file diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index a6dc8a1e5..9a4874527 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,8 +60,7 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] From 833045f2c3ec4633022b2e15ae706475c64144c5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:22:27 +0700 Subject: [PATCH 08/17] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index c29603e16..9e2c759e0 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit c29603e166d114b9f60a857367881a9cc5e9acad +Subproject commit 9e2c759e065c85e258103dc6fa1133e1c4d38145 From d4e277e2041a45b9d01339cfd602fbdd7efc9353 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 17:25:42 +0700 Subject: [PATCH 09/17] lets go --- config/embeddium++.toml | 2 +- config/jade/sort-order.json | 8 ++++---- config/roughlyenoughitems/config.json5 | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/embeddium++.toml b/config/embeddium++.toml index da6fc2ca8..72a9124f8 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -95,7 +95,7 @@ #Raise clouds #Modify clouds height perfect for a adaptative world experience #Range: 0 ~ 320 - cloudsHeight = 128 + cloudsHeight = 256 #Toggle fog feature #Fog was a vanilla feature, toggling off may increases performance fog = true diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 57218dc27..6fa827b56 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -158,10 +158,6 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -211,6 +207,10 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index 9a4874527..a6dc8a1e5 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -60,7 +60,8 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}", + "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" ], "filteringQuickCraftCategories": { }, "filteredStacks": [] From 7a71dcf732dfae5e5acda134f0cc423aff0014df Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 22 Jan 2024 20:17:50 +0700 Subject: [PATCH 10/17] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 9e2c759e0..99925b114 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 9e2c759e065c85e258103dc6fa1133e1c4d38145 +Subproject commit 99925b1145dc5b24b98bf8b18984ae8c83bbd7e4 From fa888b5bbc9af38bf648f42217d6620af2d289cd Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 22 Jan 2024 20:18:09 +0700 Subject: [PATCH 11/17] cfgs --- config/embeddium++.toml | 8 ++++++++ config/embeddium++mixin.toml | 9 --------- config/gtceu.yaml | 17 +++++++++++++++-- 3 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 config/embeddium++mixin.toml diff --git a/config/embeddium++.toml b/config/embeddium++.toml index 72a9124f8..e8c05b197 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -87,6 +87,14 @@ onEntities = true updateOnlyOnPositionChange = true + [embeddiumplus.others] + #Configure if borderless fullscreen option should be attached to F11 or replace vanilla fullscreen + #Allowed Values: ATTACH, REPLACE, OFF + borderlessAttachModeOnF11 = "OFF" + #Toggles fast language reload + #Embeddedt points it maybe cause troubles to JEI, so ¿why not add it as a toggleable option? + fastLanguageReload = true + [embeddiumplus.quality] #Chunks fade in speed #This option doesn't affect performance, just changes speed diff --git a/config/embeddium++mixin.toml b/config/embeddium++mixin.toml deleted file mode 100644 index 8eaeef932..000000000 --- a/config/embeddium++mixin.toml +++ /dev/null @@ -1,9 +0,0 @@ - -[mixin] - - [mixin.languageScreen] - fastreload = true - - [mixin.borderless] - f11 = false - diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 6bc8057f4..0fe6e3235 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -1,7 +1,7 @@ recipes: # Whether to generate Flawed and Chipped Gems for materials and recipes involving them. # Useful for mods like TerraFirmaCraft. - # Default: true + # Default: false generateLowQualityGems: true # Whether to remove Block/Ingot compression and decompression in the Crafting Table. @@ -12,7 +12,7 @@ recipes: # Default: false harderRods: true - # Whether to make crafting recipes for Bricks, Firebricks, and Coke Bricks harder. + # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. # Default: false harderBrickRecipes: false @@ -87,6 +87,15 @@ worldgen: # Default: false (no falling ores) sandOresFall: false + # Whether to increase number of rolls for dungeon chests. Increases dungeon loot drastically. + # Default: true + # WARNING: Currently unimplemented. + increaseDungeonLoot: false + + # Allow GregTech to add additional GregTech Items as loot in various structures. + # Default: true + addLoot: false + oreVeins: # The grid size (in chunks) for ore vein generation # Default: 3 @@ -279,6 +288,10 @@ compat: removeSmeltingForEBFMetals: true dev: + # Debug general events? (will print placed veins to server's debug.log) + # Default: false + debug: false + # Debug ore vein placement? (will print placed veins to server's debug.log) # Default: false (no placement printout in debug.log) debugWorldgen: false From c176609d532c575ba2bdc9e50e29d54c99e0cac8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 23 Jan 2024 13:47:26 +0700 Subject: [PATCH 12/17] cfgs --- CHANGELOG_EN.md | 8 ++++++++ CHANGELOG_RU.md | 8 ++++++++ config/gtceu.yaml | 14 +++++++------- mods | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md index 8082bd1e3..5e18387ec 100644 --- a/CHANGELOG_EN.md +++ b/CHANGELOG_EN.md @@ -1,5 +1,13 @@ # Changelog +## [0.6.7] - ? +### Изменения +- The toolheads have been removed from the materials, and since they should not exist, we clean up after Greg again. +- Added and optimized a lot of mods/configs for optimization. +- Added QOL mods. +- F11 is now working correctly. +- Fixes to work with the latest greg. + ## [0.6.6] - 21.01.2024 ### Изменения - Fixed a lot of recipes with unknown tags. diff --git a/CHANGELOG_RU.md b/CHANGELOG_RU.md index 74786fa12..e50b22d82 100644 --- a/CHANGELOG_RU.md +++ b/CHANGELOG_RU.md @@ -1,5 +1,13 @@ # Changelog +## [0.6.7] - ? +### Изменения +- Удалены оголовья из материалов, и зкоторых он не должны существовать, опять подчищаем за грегом. +- Добавлено и оптимизировано множество модов/конфигов на оптимизацию. +- Добавлены QOL моды. +- F11 теперь работает правильно. +- Исправления для работы с последним грегом. + ## [0.6.6] - 21.01.2024 ### Изменения - Исправлено множество рецептов с неизвестными тегами. diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 0fe6e3235..013f7e92e 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -14,16 +14,16 @@ recipes: # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. # Default: false - harderBrickRecipes: false + harderBrickRecipes: true # Whether to nerf Wood crafting to 2 Planks from 1 Log, and 2 Sticks from 2 Planks. # Default: false - nerfWoodCrafting: false + nerfWoodCrafting: true # Whether to make Wood related recipes harder. # Excludes sticks and planks. # Default: false - hardWoodRecipes: false + hardWoodRecipes: true # Recipes for Buckets, Cauldrons, Hoppers, and Iron Bars require Iron Plates, Rods, and more. # Default: true @@ -31,16 +31,16 @@ recipes: # Whether to make Redstone related recipes harder. # Default: false - hardRedstoneRecipes: false + hardRedstoneRecipes: true # Whether to make Vanilla Tools and Armor recipes harder. # Excludes Flint and Steel, and Buckets. # Default: false - hardToolArmorRecipes: false + hardToolArmorRecipes: true # Whether to make miscellaneous recipes harder. # Default: false - hardMiscRecipes: false + hardMiscRecipes: true # Whether to make Glass related recipes harder. Default: true hardGlassRecipes: true @@ -51,7 +51,7 @@ recipes: # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more. # Default: false - hardAdvancedIronRecipes: false + hardAdvancedIronRecipes: true # Whether to make coloring blocks like Concrete or Glass harder. # Default: false diff --git a/mods b/mods index 99925b114..dc0007e2f 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 99925b1145dc5b24b98bf8b18984ae8c83bbd7e4 +Subproject commit dc0007e2f621e5725c476bfb89ab6f14685823ea From 91fdf48221335c4251bd892d0b2616a61d1818f7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 23 Jan 2024 13:48:07 +0700 Subject: [PATCH 13/17] Update main_server_script.js --- kubejs/server_scripts/main_server_script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 1184969ad..a9cf4c2cb 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -105,7 +105,7 @@ ServerEvents.recipes(event => { registerFTBQuestsRecipes(event) - registerChiselAndBitsRecipes(event) + // registerChiselAndBitsRecipes(event) }) /** From 49b2b6f368b5b294bdaa38406e7e45e5425e9a43 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 24 Jan 2024 10:38:06 +0700 Subject: [PATCH 14/17] dead --- config/gtceu.yaml | 14 +++++++------- kubejs/client_scripts/main_client_script.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 013f7e92e..0fe6e3235 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -14,16 +14,16 @@ recipes: # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. # Default: false - harderBrickRecipes: true + harderBrickRecipes: false # Whether to nerf Wood crafting to 2 Planks from 1 Log, and 2 Sticks from 2 Planks. # Default: false - nerfWoodCrafting: true + nerfWoodCrafting: false # Whether to make Wood related recipes harder. # Excludes sticks and planks. # Default: false - hardWoodRecipes: true + hardWoodRecipes: false # Recipes for Buckets, Cauldrons, Hoppers, and Iron Bars require Iron Plates, Rods, and more. # Default: true @@ -31,16 +31,16 @@ recipes: # Whether to make Redstone related recipes harder. # Default: false - hardRedstoneRecipes: true + hardRedstoneRecipes: false # Whether to make Vanilla Tools and Armor recipes harder. # Excludes Flint and Steel, and Buckets. # Default: false - hardToolArmorRecipes: true + hardToolArmorRecipes: false # Whether to make miscellaneous recipes harder. # Default: false - hardMiscRecipes: true + hardMiscRecipes: false # Whether to make Glass related recipes harder. Default: true hardGlassRecipes: true @@ -51,7 +51,7 @@ recipes: # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more. # Default: false - hardAdvancedIronRecipes: true + hardAdvancedIronRecipes: false # Whether to make coloring blocks like Concrete or Glass harder. # Default: false diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index 28294d973..3b2566af2 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -43,7 +43,7 @@ const hideItems = (event) => { hideMoreRedStuff(event) hideRailWaysStuff(event) hideCreateAdditionsStuff(event) - hideChiselAndBitsStuff(event) + // hideChiselAndBitsStuff(event) hideFTBQuestsStuff(event) } From 29fa1678b999a8e1156378f47b42124e3fdfce4b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 24 Jan 2024 10:45:24 +0700 Subject: [PATCH 15/17] Update primitive_age.snbt --- .../quests/chapters/primitive_age.snbt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 3f7532c61..91d682401 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -2924,10 +2924,19 @@ ] id: "7C3F180555E12A88" tasks: [{ - amount: 1L - fluid: "gtceu:latex" - id: "0CE60474774B2645" - type: "fluid" + id: "4DB6481F8CA18725" + item: { + Count: 1b + id: "tfc:wooden_bucket" + tag: { + fluid: { + Amount: 1000 + FluidName: "gtceu:latex" + } + } + } + match_nbt: true + type: "item" }] x: -8.0d y: 5.0d @@ -4346,7 +4355,6 @@ "6E24ECF6CEE950D1" ] id: "34ABDCB5BA778DE4" - min_required_dependencies: 16 tasks: [{ count: 16L id: "2579EAFE552BA628" @@ -4710,6 +4718,7 @@ id: "toolbelt:belt" tag: { } } + match_nbt: false type: "item" } { From 27ebdcda97392d7858709fd13b717f77ec0a83c8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 24 Jan 2024 10:55:23 +0700 Subject: [PATCH 16/17] remove immediatlyfast because this breaks some block rendering --- CHANGELOG_EN.md | 2 ++ CHANGELOG_RU.md | 2 ++ config/immediatelyfast.json | 22 ---------------------- mods | 2 +- 4 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 config/immediatelyfast.json diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md index 5e18387ec..41ecaf9f0 100644 --- a/CHANGELOG_EN.md +++ b/CHANGELOG_EN.md @@ -7,6 +7,8 @@ - Added QOL mods. - F11 is now working correctly. - Fixes to work with the latest greg. +- Fixed latex bucket quest. +- Fixed strings quest. ## [0.6.6] - 21.01.2024 ### Изменения diff --git a/CHANGELOG_RU.md b/CHANGELOG_RU.md index e50b22d82..5dd805cef 100644 --- a/CHANGELOG_RU.md +++ b/CHANGELOG_RU.md @@ -7,6 +7,8 @@ - Добавлены QOL моды. - F11 теперь работает правильно. - Исправления для работы с последним грегом. +- Исправлен квест на ведро латекса. +- ИСправлен квест на нитки. ## [0.6.6] - 21.01.2024 ### Изменения diff --git a/config/immediatelyfast.json b/config/immediatelyfast.json deleted file mode 100644 index b34da085c..000000000 --- a/config/immediatelyfast.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "REGULAR_INFO": "----- Regular config values below -----", - "font_atlas_resizing": true, - "map_atlas_generation": true, - "hud_batching": true, - "fast_text_lookup": true, - "fast_buffer_upload": true, - "fast_buffer_upload_size_mb": 256, - "fast_buffer_upload_explicit_flush": true, - "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----", - "dont_add_info_into_debug_hud": false, - "EXPERIMENTAL_INFO": "----- Experimental config values below (Rendering glitches may occur) -----", - "experimental_disable_error_checking": false, - "experimental_disable_resource_pack_conflict_handling": false, - "experimental_sign_text_buffering": false, - "experimental_screen_batching": false, - "DEBUG_INFO": "----- Debug only config values below (Do not touch) -----", - "debug_only_and_not_recommended_disable_universal_batching": false, - "debug_only_and_not_recommended_disable_mod_conflict_handling": false, - "debug_only_and_not_recommended_disable_hardware_conflict_handling": false, - "debug_only_print_additional_error_information": false -} \ No newline at end of file diff --git a/mods b/mods index dc0007e2f..c68cdccab 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit dc0007e2f621e5725c476bfb89ab6f14685823ea +Subproject commit c68cdccab3b69d86e5bdf51e85ab85ceab9c4ab3 From eab1f78eba117fcd3c9659f9b40051e3b4ed3924 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 24 Jan 2024 11:16:53 +0700 Subject: [PATCH 17/17] restore if --- config/immediatelyfast.json | 22 ++++++++++++++++++++++ mods | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 config/immediatelyfast.json diff --git a/config/immediatelyfast.json b/config/immediatelyfast.json new file mode 100644 index 000000000..bed6bd40c --- /dev/null +++ b/config/immediatelyfast.json @@ -0,0 +1,22 @@ +{ + "REGULAR_INFO": "----- Regular config values below -----", + "font_atlas_resizing": true, + "map_atlas_generation": true, + "hud_batching": false, + "fast_text_lookup": true, + "fast_buffer_upload": true, + "fast_buffer_upload_size_mb": 256, + "fast_buffer_upload_explicit_flush": true, + "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----", + "dont_add_info_into_debug_hud": false, + "EXPERIMENTAL_INFO": "----- Experimental config values below (Rendering glitches may occur) -----", + "experimental_disable_error_checking": false, + "experimental_disable_resource_pack_conflict_handling": false, + "experimental_sign_text_buffering": false, + "experimental_screen_batching": false, + "DEBUG_INFO": "----- Debug only config values below (Do not touch) -----", + "debug_only_and_not_recommended_disable_universal_batching": false, + "debug_only_and_not_recommended_disable_mod_conflict_handling": false, + "debug_only_and_not_recommended_disable_hardware_conflict_handling": false, + "debug_only_print_additional_error_information": false +} \ No newline at end of file diff --git a/mods b/mods index c68cdccab..03fa8df17 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit c68cdccab3b69d86e5bdf51e85ab85ceab9c4ab3 +Subproject commit 03fa8df176689e9c74d670d127fab6be6fd467c6