From 5802c4f0b7624e42b20c2c1137cecf9b2e969e84 Mon Sep 17 00:00:00 2001 From: azw Date: Sat, 7 Sep 2024 05:40:50 +0800 Subject: [PATCH] 121 --- .gitea/workflows/build.yml | 6 + .../config/fabric/indigo-renderer.properties | 2 +- .../config/indium-renderer.properties | 2 +- .../exampleIntegrationHints.json | 47 ---- .../inventoryprofiles.json | 5 - .../新的世界/villager-trading-config.json | 53 ----- package/overrides/config/iris.properties | 2 +- package/overrides/config/jei/blacklist.cfg | 0 .../jei/ingredient-list-mod-sort-order.ini | 13 -- .../jei/ingredient-list-type-sort-order.ini | 2 - package/overrides/config/jei/jei-client.ini | 218 ------------------ package/overrides/config/jei/jei-colors.ini | 8 - package/overrides/config/jei/jei-debug.ini | 27 --- .../config/jei/jei-mod-id-format.ini | 11 - .../config/jei/recipe-category-sort-order.ini | 69 ------ .../jei/world/local/______1/bookmarks.ini | 5 - .../overrides/config/packetfixer.properties | 2 +- .../config/roughlyenoughitems/config.json5 | 3 +- .../roughlyenoughitems/pinyin.properties | 2 +- .../pinyin_double.properties | 2 +- .../config/xaerominimap_entities.json | 4 +- .../mods/wats-1.20+1.20.4-Fabric-1.0.7.jar | 4 +- ...-Mod-Language-Modpack-Converted-1.20.1.zip | 2 +- package/server-manifest.json | 76 ++---- server.properties | 2 +- 25 files changed, 33 insertions(+), 534 deletions(-) delete mode 100644 package/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json delete mode 100644 package/overrides/config/inventoryprofilesnext/inventoryprofiles.json delete mode 100644 package/overrides/config/inventoryprofilesnext/新的世界/villager-trading-config.json delete mode 100644 package/overrides/config/jei/blacklist.cfg delete mode 100644 package/overrides/config/jei/ingredient-list-mod-sort-order.ini delete mode 100644 package/overrides/config/jei/ingredient-list-type-sort-order.ini delete mode 100644 package/overrides/config/jei/jei-client.ini delete mode 100644 package/overrides/config/jei/jei-colors.ini delete mode 100644 package/overrides/config/jei/jei-debug.ini delete mode 100644 package/overrides/config/jei/jei-mod-id-format.ini delete mode 100644 package/overrides/config/jei/recipe-category-sort-order.ini delete mode 100644 package/overrides/config/jei/world/local/______1/bookmarks.ini diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 84a8264..ccfbbf0 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -42,3 +42,9 @@ jobs: files: |- bin/** api_key: '${{ secrets.GITHUB_TOKEN }}' + - name: release datapack + uses: akkuman/gitea-release-action@v1 + with: + files: |- + package/overrides/resourcepacks/** + api_key: '${{ secrets.GITHUB_TOKEN }}' diff --git a/package/overrides/config/fabric/indigo-renderer.properties b/package/overrides/config/fabric/indigo-renderer.properties index 468238b..226d19a 100644 --- a/package/overrides/config/fabric/indigo-renderer.properties +++ b/package/overrides/config/fabric/indigo-renderer.properties @@ -1,5 +1,5 @@ #Indigo properties file -#Tue Sep 03 12:31:42 CST 2024 +#Sat Sep 07 05:30:57 CST 2024 always-tesselate-blocks=auto ambient-occlusion-mode=hybrid debug-compare-lighting=auto diff --git a/package/overrides/config/indium-renderer.properties b/package/overrides/config/indium-renderer.properties index ed6aecc..5d7df71 100644 --- a/package/overrides/config/indium-renderer.properties +++ b/package/overrides/config/indium-renderer.properties @@ -1,4 +1,4 @@ #Indium properties file -#Tue Sep 03 12:31:42 CST 2024 +#Sat Sep 07 05:30:57 CST 2024 always-tesselate-blocks=auto ambient-occlusion-mode=auto diff --git a/package/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json b/package/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json deleted file mode 100644 index 0f246d5..0000000 --- a/package/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "package.name.className": { - "ignore": false, - "playerSideOnly": false, - "force": false, - "buttonHints": { - "SORT": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "SORT_COLUMNS": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "SORT_ROWS": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "MOVE_TO_CONTAINER": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "MOVE_TO_PLAYER": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "CONTINUOUS_CRAFTING": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0 - }, - "PROFILE_SELECTOR": { - "horizontalOffset": 0, - "top": 0, - "bottom": 0, - "hide": true - } - } - }, - "another.package.name.className": { - } -} \ No newline at end of file diff --git a/package/overrides/config/inventoryprofilesnext/inventoryprofiles.json b/package/overrides/config/inventoryprofilesnext/inventoryprofiles.json deleted file mode 100644 index f1ef44f..0000000 --- a/package/overrides/config/inventoryprofilesnext/inventoryprofiles.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ModSettings": { - "first_run": false - } -} \ No newline at end of file diff --git a/package/overrides/config/inventoryprofilesnext/新的世界/villager-trading-config.json b/package/overrides/config/inventoryprofilesnext/新的世界/villager-trading-config.json deleted file mode 100644 index c1d9ce9..0000000 --- a/package/overrides/config/inventoryprofilesnext/新的世界/villager-trading-config.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "globalBookmarks": { - "armorer": [], - "butcher": [], - "cartographer": [], - "cleric": [], - "farmer": [], - "fisherman": [], - "fletcher": [], - "leatherworker": [], - "librarian": [], - "mason": [], - "shepherd": [], - "toolsmith": [], - "weaponsmith": [], - "nitwit": [], - "none": [] - }, - "globalBookmarks1": { - "armorer": [], - "butcher": [], - "cartographer": [], - "cleric": [], - "farmer": [], - "fisherman": [], - "fletcher": [], - "leatherworker": [], - "librarian": [], - "mason": [], - "shepherd": [], - "toolsmith": [], - "weaponsmith": [], - "nitwit": [], - "none": [] - }, - "globalBookmarks2": { - "armorer": [], - "butcher": [], - "cartographer": [], - "cleric": [], - "farmer": [], - "fisherman": [], - "fletcher": [], - "leatherworker": [], - "librarian": [], - "mason": [], - "shepherd": [], - "toolsmith": [], - "weaponsmith": [], - "nitwit": [], - "none": [] - } -} \ No newline at end of file diff --git a/package/overrides/config/iris.properties b/package/overrides/config/iris.properties index 68bf992..0ce764c 100644 --- a/package/overrides/config/iris.properties +++ b/package/overrides/config/iris.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Tue Sep 03 12:32:03 CST 2024 +#Sat Sep 07 05:31:00 CST 2024 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/package/overrides/config/jei/blacklist.cfg b/package/overrides/config/jei/blacklist.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/package/overrides/config/jei/ingredient-list-mod-sort-order.ini b/package/overrides/config/jei/ingredient-list-mod-sort-order.ini deleted file mode 100644 index a204d67..0000000 --- a/package/overrides/config/jei/ingredient-list-mod-sort-order.ini +++ /dev/null @@ -1,13 +0,0 @@ -Minecraft -Applied Energistics 2 -Create -Create Crafts & Additions -Create Enchantment Industry -Create Utilities -Create: Steam 'n' Rails -Delightful Creators -Farmer's Delight -Milk Lib -Botania -Sophisticated Backpacks -Sophisticated Core diff --git a/package/overrides/config/jei/ingredient-list-type-sort-order.ini b/package/overrides/config/jei/ingredient-list-type-sort-order.ini deleted file mode 100644 index 16500ec..0000000 --- a/package/overrides/config/jei/ingredient-list-type-sort-order.ini +++ /dev/null @@ -1,2 +0,0 @@ -net.minecraft.class_1799 -mezz.jei.api.fabric.ingredients.fluids.IJeiFluidIngredient diff --git a/package/overrides/config/jei/jei-client.ini b/package/overrides/config/jei/jei-client.ini deleted file mode 100644 index 2f44504..0000000 --- a/package/overrides/config/jei/jei-client.ini +++ /dev/null @@ -1,218 +0,0 @@ -[appearance] - # Description: Display search bar in the center - # Valid Values: [true, false] - # Default Value: false - CenterSearch = false - - # Description: Max. recipe gui height - # Valid Values: Any integer greater than or equal to 175 - # Default Value: 350 - RecipeGuiHeight = 350 - - -[cheat_mode] - # Description: How items should be handed to you - # Valid Values: [INVENTORY, MOUSE_PICKUP] - # Default Value: MOUSE_PICKUP - GiveMode = MOUSE_PICKUP - - # Description: Enable cheating items into the hotbar by using the shift+number keys. - # Valid Values: [true, false] - # Default Value: false - CheatToHotbarUsingHotkeysEnabled = false - - # Description: Enable showing items that are not in the creative menu. - # Valid Values: [true, false] - # Default Value: false - ShowHiddenItems = false - - -[bookmarks] - # Description: Add new bookmarks to the front of the bookmark list instead of the end. - # Valid Values: [true, false] - # Default Value: false - AddBookmarksToFrontEnabled = false - - # Description: Extra features for bookmark tooltips - # Valid Values: A comma-separated list containing values of: - # [PREVIEW, INGREDIENTS] - # Default Value: PREVIEW - BookmarkTooltipFeatures = PREVIEW - - # Description: Hold shift to show bookmark tooltip features - # Valid Values: [true, false] - # Default Value: true - HoldShiftToShowBookmarkTooltipFeatures = true - - # Description: Drag bookmarks to rearrange them in the list - # Valid Values: [true, false] - # Default Value: true - DragToRearrangeBookmarksEnabled = true - - -[advanced] - # Description: Set low-memory mode (makes search very slow, but uses less RAM) - # Valid Values: [true, false] - # Default Value: false - LowMemorySlowSearchEnabled = false - - # Description: Catch render errors from ingredients and attempt to recover from them instead of crashing. - # Valid Values: [true, false] - # Default Value: true - CatchRenderErrorsEnabled = 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 - lookupFluidContentsEnabled = false - - # Description: When searching for item tags, also include tags for the default blocks contained in the items. - # Valid Values: [true, false] - # Default Value: true - lookupBlockTagsEnabled = true - - -[input] - # Description: Number of milliseconds before a long mouse click is considered to become a drag operation - # Valid Values: An integer in the range [0, 1000] (inclusive) - # Default Value: 150 - dragDelayInMilliseconds = 150 - - # Description: Scroll rate for scrolling the mouse wheel in smooth-scrolling scroll boxes. Measured in pixels. - # Valid Values: An integer in the range [1, 50] (inclusive) - # Default Value: 9 - smoothScrollRate = 9 - - -[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 - - # Description: Sorting order for displayed recipes - # Valid Values: A comma-separated list containing values of: - # [BOOKMARKED, CRAFTABLE] - # Default Value: BOOKMARKED, CRAFTABLE - RecipeSorterStages = BOOKMARKED, CRAFTABLE - - -[tags] - # Description: Show tag content in tooltips - # Valid Values: [true, false] - # Default Value: true - TagContentTooltipEnabled = true - - # Description: Hide tags that only have 1 ingredient - # Valid Values: [true, false] - # Default Value: true - HideSingleIngredientTagsEnabled = true - - -[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 - - # Description: Search mod ids in addition to mod names - # Valid Values: [true, false] - # Default Value: true - SearchModIds = true - - # Description: Search by the shorthand first letters of a mod's name - # Valid Values: [true, false] - # Default Value: true - SearchShortModNames = true - - -[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/package/overrides/config/jei/jei-colors.ini b/package/overrides/config/jei/jei-colors.ini deleted file mode 100644 index 1fc7da4..0000000 --- a/package/overrides/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/package/overrides/config/jei/jei-debug.ini b/package/overrides/config/jei/jei-debug.ini deleted file mode 100644 index 0989683..0000000 --- a/package/overrides/config/jei/jei-debug.ini +++ /dev/null @@ -1,27 +0,0 @@ -[debug] - # Description: Debug mode enabled - # Valid Values: [true, false] - # Default Value: false - DebugMode = false - - # Description: Debug GUIs enabled - # Valid Values: [true, false] - # Default Value: false - DebugGuis = false - - # Description: Debug inputs enabled - # Valid Values: [true, false] - # Default Value: false - DebugInputs = false - - # Description: Debug ingredients enabled - # Valid Values: [true, false] - # Default Value: false - DebugIngredients = false - - # Description: Adds ingredients to JEI that intentionally crash, to help debug JEI. - # Valid Values: [true, false] - # Default Value: false - CrashingTestItemsEnabled = false - - diff --git a/package/overrides/config/jei/jei-mod-id-format.ini b/package/overrides/config/jei/jei-mod-id-format.ini deleted file mode 100644 index 05234a8..0000000 --- a/package/overrides/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/package/overrides/config/jei/recipe-category-sort-order.ini b/package/overrides/config/jei/recipe-category-sort-order.ini deleted file mode 100644 index b14e0c7..0000000 --- a/package/overrides/config/jei/recipe-category-sort-order.ini +++ /dev/null @@ -1,69 +0,0 @@ -minecraft:crafting -minecraft:anvil -minecraft:blasting -minecraft:block -minecraft:brewing -minecraft:campfire -minecraft:compostable -minecraft:fluid -minecraft:fuel -minecraft:furnace -minecraft:item -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 -create_enchantment_industry:disenchanting -createaddition:charging -createaddition:liquid_burning -createaddition:rolling -farmersdelight:cooking -farmersdelight:cutting -farmersdelight:decomposition -jei:information -jeresources:dungeon -jeresources:enchantment -jeresources:mob -jeresources:plant -jeresources:villager -jeresources:worldgen -botania:brewery -botania:elven_trade -botania:mana_pool -botania:marimorphosis -botania:orechid -botania:orechid_ignem -botania:petals -botania:pure_daisy -botania:runic_altar -botania:terra_plate diff --git a/package/overrides/config/jei/world/local/______1/bookmarks.ini b/package/overrides/config/jei/world/local/______1/bookmarks.ini deleted file mode 100644 index 42ee5ec..0000000 --- a/package/overrides/config/jei/world/local/______1/bookmarks.ini +++ /dev/null @@ -1,5 +0,0 @@ -R:minecraft:crafting#ae2:network/cables/glass_fluix#item_stack&ae2:fluix_glass_cable -R:minecraft:crafting#ae2:network/blocks/controller#item_stack&ae2:controller -R:minecraft:crafting#ae2:network/cells/item_storage_components_cell_256k_part#item_stack&ae2:cell_component_256k -R:minecraft:crafting#ae2:network/cells/item_storage_components_cell_4k_part#item_stack&ae2:cell_component_4k -R:minecraft:crafting#minecraft:iron_ingot_from_nuggets#item_stack&minecraft:iron_ingot diff --git a/package/overrides/config/packetfixer.properties b/package/overrides/config/packetfixer.properties index e5c34af..c3c8807 100644 --- a/package/overrides/config/packetfixer.properties +++ b/package/overrides/config/packetfixer.properties @@ -1,7 +1,7 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 2097152 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Tue Sep 03 12:31:03 CST 2024 +#Sat Sep 07 05:30:44 CST 2024 decoderSize=838860800 nbtMaxSize=209715200 packetSize=104857600 diff --git a/package/overrides/config/roughlyenoughitems/config.json5 b/package/overrides/config/roughlyenoughitems/config.json5 index 5ab029d..8cfee77 100644 --- a/package/overrides/config/roughlyenoughitems/config.json5 +++ b/package/overrides/config/roughlyenoughitems/config.json5 @@ -168,8 +168,7 @@ "shouldFilterDisplays": true, "filteringRules": [ "{id:\"roughlyenoughitems:manual\",rule:{}}", - "{id:\"roughlyenoughitems:basic\",rule:{}}", - "{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}" + "{id:\"roughlyenoughitems:basic\",rule:{}}" ] } } diff --git a/package/overrides/config/roughlyenoughitems/pinyin.properties b/package/overrides/config/roughlyenoughitems/pinyin.properties index caa563b..e22a64e 100644 --- a/package/overrides/config/roughlyenoughitems/pinyin.properties +++ b/package/overrides/config/roughlyenoughitems/pinyin.properties @@ -1,2 +1,2 @@ #Pinyin Options -#Tue Sep 03 12:33:09 CST 2024 +#Sat Sep 07 05:21:47 CST 2024 diff --git a/package/overrides/config/roughlyenoughitems/pinyin_double.properties b/package/overrides/config/roughlyenoughitems/pinyin_double.properties index 98d42c9..9d51016 100644 --- a/package/overrides/config/roughlyenoughitems/pinyin_double.properties +++ b/package/overrides/config/roughlyenoughitems/pinyin_double.properties @@ -1,3 +1,3 @@ #Double Pinyin Options -#Tue Sep 03 12:33:09 CST 2024 +#Sat Sep 07 05:21:47 CST 2024 Converter=sougou diff --git a/package/overrides/config/xaerominimap_entities.json b/package/overrides/config/xaerominimap_entities.json index 93efd90..9122972 100644 --- a/package/overrides/config/xaerominimap_entities.json +++ b/package/overrides/config/xaerominimap_entities.json @@ -10,16 +10,16 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "startFadingAt": 0.0, "dotSize": 2.0, + "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, "heightLimit": 20.0, diff --git a/package/overrides/mods/wats-1.20+1.20.4-Fabric-1.0.7.jar b/package/overrides/mods/wats-1.20+1.20.4-Fabric-1.0.7.jar index 389ba28..0e71e66 100644 --- a/package/overrides/mods/wats-1.20+1.20.4-Fabric-1.0.7.jar +++ b/package/overrides/mods/wats-1.20+1.20.4-Fabric-1.0.7.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6dc441dd230f1f0d06c12d790f64fd71fee373ffadd407ff653bfb39921bfc1 -size 21446 +oid sha256:3bb60ca0b084cee5729a6c8b4b222f289b7bfd42cd072fa8b1467262cde9eb5b +size 19918 diff --git a/package/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip b/package/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip index fb77913..829403f 100644 --- a/package/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip +++ b/package/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb271a0ea398951e5ce489c83c197c1b1279fc41f25c1ee9a4c70d4d604cd379 +oid sha256:a184963a17c21bcbc065da1a2b0387f9d0809eead15ce350cce4667c1bc41994 size 2407077 diff --git a/package/server-manifest.json b/package/server-manifest.json index 65905ae..915e01d 100644 --- a/package/server-manifest.json +++ b/package/server-manifest.json @@ -1,7 +1,7 @@ { "name": "1.20.1", "author": "azw", - "version": "1.5.2", + "version": "1.5.3", "description": "", "fileApi": "https://git.azw.net.cn/VTBHelper/nebulabeat-mc/media/branch/main/package", "files": [ @@ -107,7 +107,7 @@ }, { "path": "mods/wats-1.20+1.20.4-Fabric-1.0.7.jar", - "hash": "6b85e978bfe2b5640287423931d80a20665b4987" + "hash": "f2c7d2898a7318990e03a7a589a4f04f04210832" }, { "path": "mods/CustomSkinLoader_Fabric-14.20.jar", @@ -215,48 +215,12 @@ }, { "path": "config/fabric/indigo-renderer.properties", - "hash": "367a9c8b2549eac0ae00d9b99a04225818304826" + "hash": "8a9111805aac15421b6ed18784c9f5a2d224bb29" }, { "path": "config/flywheel.json", "hash": "0bacb5959ae82334b64b71a88a178b368c60dae5" }, - { - "path": "config/jei/jei-debug.ini", - "hash": "6c9c889debdc49bbcb5cc370171e9261acfdc7c9" - }, - { - "path": "config/jei/jei-mod-id-format.ini", - "hash": "5c325621f6d8034afee1563dfc85f022fc733f7d" - }, - { - "path": "config/jei/jei-colors.ini", - "hash": "c8146f049dde2adec35a419c7a0a143daa0edc80" - }, - { - "path": "config/jei/jei-client.ini", - "hash": "3f859f855bb32052b1402a24a870fed0488831a7" - }, - { - "path": "config/jei/blacklist.cfg", - "hash": "da39a3ee5e6b4b0d3255bfef95601890afd80709" - }, - { - "path": "config/jei/recipe-category-sort-order.ini", - "hash": "b04858a4d9267b2d73b6064e04c2aaf292eba423" - }, - { - "path": "config/jei/ingredient-list-mod-sort-order.ini", - "hash": "2cc3403e5cfb83ade5bbe60ea5ce8ff7f0ef3d3a" - }, - { - "path": "config/jei/ingredient-list-type-sort-order.ini", - "hash": "2802426f57118110bb6361e2a2f128e0a873219e" - }, - { - "path": "config/jei/world/local/______1/bookmarks.ini", - "hash": "c8ad13294086b7af70991b9eabd896cacab45f13" - }, { "path": "config/sodium-options.json", "hash": "ee771ac918a46113518a4fb7282813fec88a8289" @@ -283,7 +247,7 @@ }, { "path": "config/iris.properties", - "hash": "628ff2a2f8bcbcf2ef7161d209840067048a8996" + "hash": "d4ca1604b1a4910dc334db7004fb92d9978111f3" }, { "path": "config/railways-server.toml", @@ -299,11 +263,11 @@ }, { "path": "config/packetfixer.properties", - "hash": "052ff893bace748c715515721a45df62f3368d12" + "hash": "44b15a8e1bcae59adb921d1b76b8372ecd9c2e71" }, { "path": "config/indium-renderer.properties", - "hash": "8f42cf7df8378a9ecf70582d6282b57a8fd817b8" + "hash": "07e0148943faf528d3ee95b941610f415b0871c7" }, { "path": "config/cardinal-components-api.properties", @@ -341,18 +305,6 @@ "path": "config/modmenu.json", "hash": "7e4d498194b4cfea3ac311623fe09a3fa2927860" }, - { - "path": "config/inventoryprofilesnext/inventoryprofiles.json", - "hash": "58b81b870399a90daad1a3249c68c2d5bd18abf9" - }, - { - "path": "config/inventoryprofilesnext/新的世界/villager-trading-config.json", - "hash": "e2593acfcb9d84fa2c050b145242d28cc28fb25f" - }, - { - "path": "config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json", - "hash": "2bedb4d58a778b937dd9da01c50a46af9887709b" - }, { "path": "config/tpm.json", "hash": "9aaabf2753348adce0df841acd79c2db7fd01f91" @@ -421,6 +373,10 @@ "path": "config/cccbridge.properties", "hash": "8e293e61f6bd16a779dcf8aeb88d6ea08d4baad6" }, + { + "path": "config/xaerominimap_entities.json", + "hash": "21fd62895118ce2198968bc8feb3ba9e2031f206" + }, { "path": "config/sophisticatedcore-client.toml", "hash": "095a9d51916c75c98f3246284c9375687e777a7d" @@ -443,7 +399,7 @@ }, { "path": "config/roughlyenoughitems/config.json5", - "hash": "d817597b52cd72196275610adaed4a2e4fb0dcb8" + "hash": "5b91546615bf10f2dc38c27dd6fdebe1fc6bda38" }, { "path": "config/roughlyenoughitems/favorites.json5", @@ -459,11 +415,11 @@ }, { "path": "config/roughlyenoughitems/pinyin.properties", - "hash": "026f7deee79f09a7b42e245bc9591647bf054b13" + "hash": "a12c3de689ac59e1b86a4194dd41b624c147857d" }, { "path": "config/roughlyenoughitems/pinyin_double.properties", - "hash": "5642761fc6c864d49c4834455634ee334e205255" + "hash": "c2376773980578fb85b3fef55ca30c0936c44644" }, { "path": "config/roughlyenoughitems/unihan.zip", @@ -509,13 +465,9 @@ "path": "config/createbigcannons-common.toml", "hash": "adc83b19e793491b1c6ea0fd8b46cd9f32e592fc" }, - { - "path": "config/xaerominimap_entities.json", - "hash": "f53212e7f4a92618720786df4470715657238df3" - }, { "path": "resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip", - "hash": "33c4dc7c472c259c8bd2d997b82881ac42e3c5fe" + "hash": "19e868caf68a17fee0214cb41bb55ce0e5aa2f65" }, { "path": ".i18nupdatemod/1.20/Minecraft-Mod-Language-Modpack-1-20-Fabric.zip", diff --git a/server.properties b/server.properties index 836b4a3..71eaf60 100644 --- a/server.properties +++ b/server.properties @@ -4,7 +4,7 @@ allow-flight=true allow-nether=true broadcast-console-to-ops=true broadcast-rcon-to-ops=true -difficulty=normal +difficulty=hard enable-command-block=false enable-jmx-monitoring=false enable-query=false