diff --git a/README.zh-CN.md b/README.zh-CN.md index 3eae63a..8eec1ac 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -4,4 +4,6 @@ # 更新日志 -26-2-25: 推送第一个整合包版本 \ No newline at end of file +26-2-25: 推送第一个整合包版本 + +26-2-26：v3.0.2：更新资源包到1.21.1 \ No newline at end of file diff --git a/overrides/config/fabric/indigo-renderer.properties b/overrides/config/fabric/indigo-renderer.properties index 7250ee0..e4454b0 100644 --- a/overrides/config/fabric/indigo-renderer.properties +++ b/overrides/config/fabric/indigo-renderer.properties @@ -1,5 +1,5 @@ #Indigo properties file -#Wed Feb 25 20:34:14 CST 2026 +#Thu Feb 26 19:25:38 CST 2026 always-tesselate-blocks=auto ambient-occlusion-mode=hybrid debug-compare-lighting=auto diff --git a/overrides/config/inventoryprofilesnext/ddns.myredstone.top&4082/villager-trading-config-v2.json b/overrides/config/inventoryprofilesnext/ddns.myredstone.top&4082/villager-trading-config-v2.json new file mode 100644 index 0000000..c1d9ce9 --- /dev/null +++ b/overrides/config/inventoryprofilesnext/ddns.myredstone.top&4082/villager-trading-config-v2.json @@ -0,0 +1,53 @@ +{ + "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/overrides/config/inventoryprofilesnext/ddns.myredstone.top/villager-trading-config-v2.json b/overrides/config/inventoryprofilesnext/ddns.myredstone.top/villager-trading-config-v2.json new file mode 100644 index 0000000..c1d9ce9 --- /dev/null +++ b/overrides/config/inventoryprofilesnext/ddns.myredstone.top/villager-trading-config-v2.json @@ -0,0 +1,53 @@ +{ + "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/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json b/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json new file mode 100644 index 0000000..0f246d5 --- /dev/null +++ b/overrides/config/inventoryprofilesnext/integrationHints/exampleIntegrationHints.json @@ -0,0 +1,47 @@ +{ + "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/overrides/config/iris.properties b/overrides/config/iris.properties index b1d7f76..1bf7007 100644 --- a/overrides/config/iris.properties +++ b/overrides/config/iris.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Wed Feb 25 20:52:35 CST 2026 +#Thu Feb 26 19:25:43 CST 2026 allowUnknownShaders=false colorSpace=SRGB disableUpdateMessage=false diff --git a/overrides/config/jade/jade.json b/overrides/config/jade/jade.json index 4531348..7480f3b 100644 --- a/overrides/config/jade/jade.json +++ b/overrides/config/jade/jade.json @@ -7,7 +7,7 @@ "hideFromGUIs": true, "accessibilityModMemory": false, "enableAccessibilityPlugin": false, - "fluidMode": "ANY", + "fluidMode": "NONE", "perspectiveMode": "CAMERA", "extendedReach": 0.0, "debug": false, @@ -42,6 +42,7 @@ } }, "history": { + "hintOverlayToggle": false, "themesHash": -328442023 } } \ No newline at end of file diff --git a/overrides/config/jei/world/server/_RedCraft_Dragon_1_21_1_a3792a60/lookupHistory.json b/overrides/config/jei/world/server/_RedCraft_Dragon_1_21_1_a3792a60/lookupHistory.json new file mode 100644 index 0000000..343fac7 --- /dev/null +++ b/overrides/config/jei/world/server/_RedCraft_Dragon_1_21_1_a3792a60/lookupHistory.json @@ -0,0 +1,19 @@ +[ + {"version":1}, + {"ingredient":{"id":"minecraft:repeater"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"minecraft:redstone"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"minecraft:note_block"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"sereneseasons:calendar"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"sereneseasons:season_sensor"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"minecraft:clock"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"dragonsurvival:charged_coal"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"dragonsurvival:heart_element"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"extradelight:dried_corn_husk"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"extradelight:corn_husk_bundle"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"extradelight:corn_husk"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"minecraft:chain"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"farmersdelight:hanging_canvas_sign"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"regions_unexplored:blue_bioshroom_stem"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"regions_unexplored:maple_fence"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"regions_unexplored:maple_planks"},"type":"item_stack","bookmarkType":"INGREDIENT"} +] \ No newline at end of file diff --git a/overrides/config/sodium-options.json b/overrides/config/sodium-options.json index 2b3e422..fa83cbb 100644 --- a/overrides/config/sodium-options.json +++ b/overrides/config/sodium-options.json @@ -20,7 +20,7 @@ }, "notifications": { "has_cleared_donation_button": false, - "has_seen_donation_prompt": false + "has_seen_donation_prompt": true }, "debug": { "terrain_sorting_enabled": true diff --git a/overrides/config/voicechat/voicechat-client.properties b/overrides/config/voicechat/voicechat-client.properties index b01d3ff..d1cd342 100644 --- a/overrides/config/voicechat/voicechat-client.properties +++ b/overrides/config/voicechat/voicechat-client.properties @@ -43,7 +43,7 @@ muted=false # If the voice chat is disabled (both sound and microphone off) disabled=false # If the voice chat HUD, group chat HUD, and other in-game icons should be hidden -hide_icons=false +hide_icons=true # If the voice chat icons next to player names should be visible show_nametag_icons=true # If the voice chat icons on the HUD should be visible diff --git a/overrides/config/xaero/minimap/profiles/default.cfg b/overrides/config/xaero/minimap/profiles/default.cfg index cddeeb9..c7be3d9 100644 --- a/overrides/config/xaero/minimap/profiles/default.cfg +++ b/overrides/config/xaero/minimap/profiles/default.cfg @@ -84,7 +84,7 @@ minimap_anti_aliasing = true minimap_size = 0 minimap_shape = 0 minimap_north_locked = false -minimap_zoom = 1 +minimap_zoom = 3 minimap_cave_mode_extra_zoom = 2 minimap_enlarged_zoom = 0 minimap_centered_when_enlarged = false diff --git a/overrides/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json b/overrides/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json index 8a88db3..8590ebc 100644 --- a/overrides/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json +++ b/overrides/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json @@ -10,20 +10,20 @@ "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": false, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "dotSize": 2.0, "startFadingAt": 0.0, + "dotSize": 2.0, "renderOverMinimapFrame": 1.0, "icons": 2.0, - "names": 0.0, "heightLimit": 20.0, + "names": 0.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/overrides/options.txt b/overrides/options.txt index 5d19fb9..686ce0c 100644 --- a/overrides/options.txt +++ b/overrides/options.txt @@ -48,8 +48,8 @@ mouseSensitivity:0.31866197183098594 damageTiltStrength:1.0 highContrast:false narratorHotkey:true -resourcePacks:["vanilla","file/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip","fabric","mod_resources","tinyskeletons:dynamically_copied_skeleton_textures","moonlight:merged_pack"] -incompatibleResourcePacks:[] +resourcePacks:["vanilla","file/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip","fabric","mod_resources","tinyskeletons:dynamically_copied_skeleton_textures","moonlight:merged_pack","file/VanillaXBR - 1.21.3.zip","file/§6§lClassic 3D§c v2.0.0-A.9§e 1.21.zip"] +incompatibleResourcePacks:["file/VanillaXBR - 1.21.3.zip"] lastServer: lang:zh_cn chatVisibility:0 @@ -255,8 +255,8 @@ key_create.keyinfo.toolbelt:key.keyboard.left.alt key_create.keyinfo.rotate_menu:key.keyboard.unknown key_gui.xaero_minimap_settings:key.keyboard.y key_gui.xaero_minimap_server_profiles:key.keyboard.unknown -key_gui.xaero_zoom_in:key.keyboard.keypad.add -key_gui.xaero_zoom_out:key.keyboard.keypad.subtract +key_gui.xaero_zoom_in:key.keyboard.keypad.decimal +key_gui.xaero_zoom_out:key.keyboard.unknown key_gui.xaero_new_waypoint:key.keyboard.b key_gui.xaero_waypoints_key:key.keyboard.u key_gui.xaero_enlarge_map:key.keyboard.z @@ -288,8 +288,8 @@ key_key.category.flightassistant.thrust.increase_thrust:key.keyboard.up key_key.category.flightassistant.thrust.set_toga:key.keyboard.right key_key.open_muffler_gui:key.keyboard.unknown key_key.entityculling.toggle:key.keyboard.unknown -soundCategory_master:1.0 -soundCategory_music:0.3080930897887324 +soundCategory_master:0.6043046357615894 +soundCategory_music:0.13732394366197184 soundCategory_record:1.0 soundCategory_weather:1.0 soundCategory_block:1.0 diff --git a/overrides/resourcepacks/Faithful 64x - Release 10.zip b/overrides/resourcepacks/Faithful 64x - Release 6.zip similarity index 69% rename from overrides/resourcepacks/Faithful 64x - Release 10.zip rename to overrides/resourcepacks/Faithful 64x - Release 6.zip index 3dc72df..3307a33 100644 Binary files a/overrides/resourcepacks/Faithful 64x - Release 10.zip and b/overrides/resourcepacks/Faithful 64x - Release 6.zip differ diff --git a/overrides/resourcepacks/FaithfulPBR_128_1.20_1.0p.zip b/overrides/resourcepacks/FaithfulPBR_128_1.20_1.0p.zip deleted file mode 100644 index 6175426..0000000 Binary files a/overrides/resourcepacks/FaithfulPBR_128_1.20_1.0p.zip and /dev/null differ diff --git a/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip b/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip index d778996..ec3a0fb 100644 Binary files a/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip and b/overrides/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.21.1.zip differ diff --git a/overrides/resourcepacks/有问题Prism-64x-2.2.2.zip b/overrides/resourcepacks/ModernArch R304 [1.20.3-1.21.2] [128x].zip similarity index 65% rename from overrides/resourcepacks/有问题Prism-64x-2.2.2.zip rename to overrides/resourcepacks/ModernArch R304 [1.20.3-1.21.2] [128x].zip index fa9f6d9..ed1ecae 100644 Binary files a/overrides/resourcepacks/有问题Prism-64x-2.2.2.zip and b/overrides/resourcepacks/ModernArch R304 [1.20.3-1.21.2] [128x].zip differ diff --git a/overrides/resourcepacks/Prism-64x-2.2.2.zip b/overrides/resourcepacks/Prism-64x-2.2.2.zip deleted file mode 100644 index 28fb6ed..0000000 Binary files a/overrides/resourcepacks/Prism-64x-2.2.2.zip and /dev/null differ diff --git a/overrides/resourcepacks/Stay_True_1.21.zip b/overrides/resourcepacks/Stay_True_1.21.zip new file mode 100644 index 0000000..0eca766 Binary files /dev/null and b/overrides/resourcepacks/Stay_True_1.21.zip differ diff --git a/overrides/resourcepacks/VanillaXBR - 1.20.zip b/overrides/resourcepacks/VanillaXBR - 1.21.3.zip similarity index 58% rename from overrides/resourcepacks/VanillaXBR - 1.20.zip rename to overrides/resourcepacks/VanillaXBR - 1.21.3.zip index e75e0b1..13db544 100644 Binary files a/overrides/resourcepacks/VanillaXBR - 1.20.zip and b/overrides/resourcepacks/VanillaXBR - 1.21.3.zip differ diff --git a/overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.20.zip b/overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.21.zip similarity index 98% rename from overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.20.zip rename to overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.21.zip index 09cdb20..fc830e7 100644 Binary files a/overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.20.zip and b/overrides/resourcepacks/§6§lClassic 3D§c v2.0.0-A.9§e 1.21.zip differ diff --git a/overrides/servers.dat b/overrides/servers.dat index e3e9e84..c7e409d 100644 Binary files a/overrides/servers.dat and b/overrides/servers.dat differ