1

2024-08-23 12:08:12 +08:00
parent ee11a85011
commit 5a12c38932
27 changed files with 267 additions and 45 deletions
--- a/package/overrides/.cache/quilt_loader/transform-cache-client/files.zip
+++ b/package/overrides/.cache/quilt_loader/transform-cache-client/files.zip
--- a/package/overrides/.cache/quilt_loader/transform-cache-client/transformed-mod-minecraft-v1.20.1.jar
+++ b/package/overrides/.cache/quilt_loader/transform-cache-client/transformed-mod-minecraft-v1.20.1.jar
--- a/package/overrides/.i18nupdatemod/1.18/Minecraft-Mod-Language-Modpack-1-18-Fabric.zip
+++ b/package/overrides/.i18nupdatemod/1.18/Minecraft-Mod-Language-Modpack-1-18-Fabric.zip
--- a/package/overrides/.i18nupdatemod/1.19/Minecraft-Mod-Language-Modpack-1-19.zip
+++ b/package/overrides/.i18nupdatemod/1.19/Minecraft-Mod-Language-Modpack-1-19.zip
--- a/package/overrides/.i18nupdatemod/1.20.1/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip
+++ b/package/overrides/.i18nupdatemod/1.20.1/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip
--- a/package/overrides/.i18nupdatemod/1.20/Minecraft-Mod-Language-Modpack-1-20-Fabric.zip
+++ b/package/overrides/.i18nupdatemod/1.20/Minecraft-Mod-Language-Modpack-1-20-Fabric.zip
--- a/package/overrides/config/carpet/default_carpet.conf
+++ b/package/overrides/config/carpet/default_carpet.conf
@@ -0,0 +1,2 @@
+# This is Carpet Mod's default configuration file
+# Settings specified here will be used when a world doesn't have a config file, but they will be completely ignored once the world has one.
--- a/package/overrides/config/fabric/indigo-renderer.properties
+++ b/package/overrides/config/fabric/indigo-renderer.properties
@@ -1,5 +1,5 @@
 #Indigo properties file
-#Sun Aug 18 13:59:14 CST 2024
+#Fri Aug 23 11:53:38 CST 2024
 always-tesselate-blocks=auto
 ambient-occlusion-mode=hybrid
 debug-compare-lighting=auto
--- a/package/overrides/config/indium-renderer.properties
+++ b/package/overrides/config/indium-renderer.properties
@@ -1,4 +1,4 @@
 #Indium properties file
-#Sun Aug 18 13:59:13 CST 2024
+#Fri Aug 23 11:53:38 CST 2024
 always-tesselate-blocks=auto
 ambient-occlusion-mode=auto
--- 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
-#Sun Aug 18 13:59:15 CST 2024
+#Fri Aug 23 11:53:40 CST 2024
 colorSpace=SRGB
 disableUpdateMessage=false
 enableDebugOptions=false
--- a/package/overrides/config/jade/hide-blocks.json
+++ b/package/overrides/config/jade/hide-blocks.json
@@ -0,0 +1,6 @@
+{
+  "__comment": "This is a blocklist for the target of Jade. You can add registry ids to the \"values\" list. Restart the game to apply changes.",
+  "values": [
+    "minecraft:barrier"
+  ]
+}
--- a/package/overrides/config/jade/hide-entities.json
+++ b/package/overrides/config/jade/hide-entities.json
@@ -0,0 +1,10 @@
+{
+  "__comment": "This is a blocklist for the target of Jade. You can add registry ids to the \"values\" list. Restart the game to apply changes.",
+  "values": [
+    "minecraft:area_effect_cloud",
+    "minecraft:firework_rocket",
+    "minecraft:interaction",
+    "minecraft:text_display",
+    "minecraft:lightning_bolt"
+  ]
+}
--- a/package/overrides/config/jade/jade.json
+++ b/package/overrides/config/jade/jade.json
@@ -0,0 +1,41 @@
+{
+  "general": {
+    "debug": false,
+    "itemModNameTooltip": true,
+    "bossBarOverlapMode": "PUSH_DOWN",
+    "builtinCamouflage": true,
+    "ttsMode": "PRESS",
+    "fluidMode": "ANY",
+    "reachDistance": 0.0,
+    "displayEntities": true,
+    "displayBosses": true,
+    "displayMode": "TOGGLE",
+    "displayTooltip": true,
+    "displayBlocks": true,
+    "hideFromDebug": true,
+    "hideFromTabList": true,
+    "enableTextToSpeech": false,
+    "hintOverlayToggle": true,
+    "hintNarratorToggle": true,
+    "previewOverlay": true
+  },
+  "overlay": {
+    "alpha": 0.7,
+    "iconMode": "TOP",
+    "animation": true,
+    "disappearingDelay": 0.0,
+    "overlaySquare": false,
+    "flipMainHand": false,
+    "autoScaleThreshold": 0.4,
+    "overlayPosY": 1.0,
+    "overlayScale": 1.0,
+    "overlayAnchorX": 0.5,
+    "overlayAnchorY": 0.0,
+    "activeTheme": "jade:dark",
+    "themesHash": -328442023,
+    "overlayPosX": 0.5
+  },
+  "formatting": {
+    "modName": "§9§o%s"
+  }
+}
--- a/package/overrides/config/jade/plugins.json
+++ b/package/overrides/config/jade/plugins.json
@@ -0,0 +1,73 @@
+{
+  "minecraft": {
+    "item_storage.show_name_amount": 5,
+    "furnace": true,
+    "harvest_tool.show_unbreakable": false,
+    "animal_owner": true,
+    "harvest_tool.effective_tool": true,
+    "item_storage.normal_amount": 9,
+    "item_storage": true,
+    "harvest_tool": true,
+    "armor_stand": true,
+    "fluid_storage.detailed": false,
+    "energy_storage": true,
+    "entity_armor.max_for_render": 40,
+    "breaking_progress": true,
+    "tnt_stability": true,
+    "item_storage.items_per_line": 9,
+    "item_frame": true,
+    "crop_progress": true,
+    "command_block": true,
+    "mob_growth": true,
+    "harvest_tool.new_line": false,
+    "entity_health.max_for_render": 40,
+    "entity_health.show_fractions": false,
+    "mob_spawner": true,
+    "redstone": true,
+    "fluid_storage": true,
+    "chicken_egg": true,
+    "jukebox": true,
+    "brewing_stand": true,
+    "energy_storage.detailed": false,
+    "note_block": true,
+    "beehive": true,
+    "item_storage.detailed_amount": 54,
+    "player_head": true,
+    "block_states": false,
+    "lectern": true,
+    "entity_armor": true,
+    "harvest_tool.creative": false,
+    "horse_stats": true,
+    "item_tooltip": true,
+    "entity_health": true,
+    "enchantment_power": true,
+    "zombie_villager": true,
+    "villager_profession": true,
+    "mob_breeding": true,
+    "entity_health.icons_per_line": 10,
+    "total_enchantment_power": true,
+    "potion_effects": true,
+    "painting": true,
+    "chiseled_bookshelf": true
+  },
+  "jade": {
+    "coordinates.rel": false,
+    "distance": false,
+    "block_face": false,
+    "coordinates": false,
+    "registry_name": "OFF",
+    "mod_name": true
+  },
+  "ae2": {
+    "part_icon": true,
+    "charger": true,
+    "debug": true,
+    "part_tooltip": true,
+    "grid_node_state": true,
+    "pattern_provider": true,
+    "part_mod_name": true,
+    "power_storage": true,
+    "crafting_monitor": true,
+    "part_name": true
+  }
+}
--- a/package/overrides/config/jade/sort-order.json
+++ b/package/overrides/config/jade/sort-order.json
@@ -0,0 +1,58 @@
+{
+  "ae2:charger": null,
+  "ae2:crafting_monitor": null,
+  "ae2:debug": null,
+  "ae2:grid_node_state": null,
+  "ae2:part_icon": null,
+  "ae2:part_mod_name": null,
+  "ae2:part_name": null,
+  "ae2:part_tooltip": null,
+  "ae2:pattern_provider": null,
+  "ae2:power_storage": null,
+  "ae2:server_data": null,
+  "jade:block_face": null,
+  "jade:distance": null,
+  "jade:mod_name": null,
+  "jade:object_name": null,
+  "jade:registry_name": null,
+  "minecraft:animal_owner": null,
+  "minecraft:armor_stand": null,
+  "minecraft:beehive": null,
+  "minecraft:block_display": null,
+  "minecraft:block_states": null,
+  "minecraft:brewing_stand": null,
+  "minecraft:campfire": null,
+  "minecraft:chicken_egg": null,
+  "minecraft:chiseled_bookshelf": null,
+  "minecraft:command_block": null,
+  "minecraft:crop_progress": null,
+  "minecraft:enchantment_power": null,
+  "minecraft:energy_storage": null,
+  "minecraft:entity_armor": null,
+  "minecraft:entity_health": null,
+  "minecraft:falling_block": null,
+  "minecraft:fluid_storage": null,
+  "minecraft:furnace": null,
+  "minecraft:harvest_tool": null,
+  "minecraft:horse_stats": null,
+  "minecraft:item_ber": null,
+  "minecraft:item_display": null,
+  "minecraft:item_frame": null,
+  "minecraft:item_storage": null,
+  "minecraft:item_tooltip": null,
+  "minecraft:jukebox": null,
+  "minecraft:lectern": null,
+  "minecraft:mob_breeding": null,
+  "minecraft:mob_growth": null,
+  "minecraft:mob_spawner": null,
+  "minecraft:note_block": null,
+  "minecraft:painting": null,
+  "minecraft:player_head": null,
+  "minecraft:potion_effects": null,
+  "minecraft:progress": null,
+  "minecraft:redstone": null,
+  "minecraft:tnt_stability": null,
+  "minecraft:total_enchantment_power": null,
+  "minecraft:villager_profession": null,
+  "minecraft:zombie_villager": null
+}
--- a/package/overrides/config/jade/usernamecache.json
+++ b/package/overrides/config/jade/usernamecache.json
@@ -0,0 +1,3 @@
+{
+  "681ec534-db63-302e-a4b1-03682b275ddd": "azw"
+}
--- 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.
-#Sun Aug 18 13:59:00 CST 2024
+#Fri Aug 23 11:53:26 CST 2024
 decoderSize=838860800
 nbtMaxSize=209715200
 packetSize=104857600
--- a/package/overrides/config/roughlyenoughitems/config.json5
+++ b/package/overrides/config/roughlyenoughitems/config.json5
@@ -3,7 +3,7 @@
 		"favorites": [],
 		"hiddenFavorites": [],
 		"displayHistory": [],
-		"cheating": false,
+		"cheating": true,
 		"favoritesEnabled": true,
 		"reduceMotion": false,
 		"keyBindings": {
--- a/package/overrides/config/roughlyenoughitems/hints.json
+++ b/package/overrides/config/roughlyenoughitems/hints.json
@@ -1 +1 @@
-{"UUID":"a77368b18d9d4d83b0c311cd81832f31","shownHints":["text.rei.hint.input.methods"]}
+{"UUID":"681ec534db63302ea4b103682b275ddd","shownHints":[]}
--- a/package/overrides/config/roughlyenoughitems/pinyin.properties
+++ b/package/overrides/config/roughlyenoughitems/pinyin.properties
@@ -1,2 +1,2 @@
 #Pinyin Options
-#Sun Aug 18 14:00:09 CST 2024
+#Fri Aug 23 11:54:27 CST 2024
--- a/package/overrides/config/roughlyenoughitems/pinyin_double.properties
+++ b/package/overrides/config/roughlyenoughitems/pinyin_double.properties
@@ -1,3 +1,3 @@
 #Double Pinyin Options
-#Sun Aug 18 14:00:09 CST 2024
+#Fri Aug 23 11:54:27 CST 2024
 Converter=sougou
--- a/package/overrides/config/wats-common.toml
+++ b/package/overrides/config/wats-common.toml
@@ -7,7 +7,7 @@ monsters_in_text = true
 sp_monsters = ["minecraft:spider_eye", "minecraft:fermented_spider_eye", "minecraft:cobweb"]
 #Type monsters, they ban by 'monsters'
 #like 'bee', this is BugJump's special XD.
-sp_monsters_white = ["minecraft:bee"]
+sp_monsters_white = ["minecraft:bee", "minecraft:endermite"]
 #How to replace spawner?
 #Type entity ID.
 spawner_replacer_entities = ["minecraft:zombie", "minecraft:skeleton"]
--- a/package/overrides/config/xaerominimap.txt
+++ b/package/overrides/config/xaerominimap.txt
@@ -1,5 +1,5 @@
 #CONFIG ONLY OPTIONS
-ignoreUpdate:0
+ignoreUpdate:376
 settingsButton:false
 allowWrongWorldTeleportation:false
 differentiateByServerAddress:true
--- a/package/overrides/config/xaerominimap_entities.json
+++ b/package/overrides/config/xaerominimap_entities.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": true,
    "entityNumber": 1000.0,
    "alwaysDisplayNametags": false,
-    "dotSize": 2.0,
    "startFadingAt": 0.0,
+    "dotSize": 2.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 1.0,
-    "names": 0.0,
    "heightLimit": 20.0,
+    "names": 0.0,
    "iconScale": 1.0
  },
  "subCategories": [
--- 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
--- a/package/server-manifest.json
+++ b/package/server-manifest.json
@@ -167,11 +167,11 @@
    },
    {
      "path": ".cache/quilt_loader/transform-cache-client/files.zip",
-      "hash": "1ba6a3a7806f9ada81ab558040582e75c9c6d1c1"
+      "hash": "eb9c3b8ff430e9ac6563996bd0a3ba22760e124d"
    },
    {
      "path": ".cache/quilt_loader/transform-cache-client/transformed-mod-minecraft-v1.20.1.jar",
-      "hash": "b6454d783c900111308d66238e007d32ba279a02"
+      "hash": "bbcf017da3d02722c9155f3ce1ccece638faecf0"
    },
    {
      "path": ".cache/quilt_loader/transform-cache-client/transformed-mod-minecraft-v1.20.1.jar.finished",
@@ -211,7 +211,7 @@
    },
    {
      "path": "config/fabric/indigo-renderer.properties",
-      "hash": "949379f452e37dfa5c9f14708bf0542f53e62586"
+      "hash": "29c93735e2c0342e6c00da64db7c2959bb890e2e"
    },
    {
      "path": "config/flywheel.json",
@@ -279,7 +279,7 @@
    },
    {
      "path": "config/iris.properties",
-      "hash": "9a0333f396fae1ac001498865cc916b655033a2d"
+      "hash": "11a07914de11e9f96a448508b4dbad5f67bbbf0a"
    },
    {
      "path": "config/railways-server.toml",
@@ -295,11 +295,11 @@
    },
    {
      "path": "config/packetfixer.properties",
-      "hash": "53d63f5bd0ee733a14997abd9ff64a96529201f1"
+      "hash": "7d5b5b1c55eb3080e6887cb8ef699e2e81afdb4a"
    },
    {
      "path": "config/indium-renderer.properties",
-      "hash": "d74912049f07129a6b48653ffed8505d35e1faca"
+      "hash": "8f860375526980733b7b6e6cf33fadfabc50739f"
    },
    {
      "path": "config/cardinal-components-api.properties",
@@ -323,7 +323,7 @@
    },
    {
      "path": "config/xaerominimap.txt",
-      "hash": "67f0abb016bd5d696735efd5606268f4b0d5085b"
+      "hash": "5c071eae5fe0fccd21f3874a0d53f71b0e893849"
    },
    {
      "path": "config/xaeropatreon.txt",
@@ -331,7 +331,7 @@
    },
    {
      "path": "config/wats-common.toml",
-      "hash": "dcb99261a8a0aa326035649189dcdf64a0ab9f79"
+      "hash": "727c0bb8840cd915d9aedc34acd5c3193dd152c2"
    },
    {
      "path": "config/modmenu.json",
@@ -375,7 +375,7 @@
    },
    {
      "path": "config/xaerominimap_entities.json",
-      "hash": "3523d6db6b0543a9de55286e914bc748f7fc68d9"
+      "hash": "1ecdae76584f3c99c3d4b7b6edfcd302714de29c"
    },
    {
      "path": "config/sophisticatedcore-client.toml",
@@ -399,7 +399,7 @@
    },
    {
      "path": "config/roughlyenoughitems/config.json5",
-      "hash": "85d96015356ff957e5a939cb43e2cf52c8e7d671"
+      "hash": "d817597b52cd72196275610adaed4a2e4fb0dcb8"
    },
    {
      "path": "config/roughlyenoughitems/favorites.json5",
@@ -411,39 +411,67 @@
    },
    {
      "path": "config/roughlyenoughitems/hints.json",
-      "hash": "55c654b5a0d673a216852df0c0d6ff7ec953af82"
+      "hash": "a0d2d15ec9b0cf813dc7086472b1a057ac85614c"
    },
    {
      "path": "config/roughlyenoughitems/pinyin.properties",
-      "hash": "c011e0de028e7c233995527a8e22175f1be3c224"
+      "hash": "1a92b617e9d51e449028dffc9af9628219d9f42a"
    },
    {
      "path": "config/roughlyenoughitems/pinyin_double.properties",
-      "hash": "d46b751ccb31394a08e1fd3b15c72c1dcb44984b"
+      "hash": "78c9859f6ac75b431487dc0d5cfb2e40ac92b821"
    },
    {
      "path": "config/roughlyenoughitems/unihan.zip",
      "hash": "5a78a66e4fa649aa03c1e30dd1b7db70952923cf"
    },
+    {
+      "path": "config/jade/sort-order.json",
+      "hash": "d4a83ecda2ce1a36e21a7607ab545ed1bf89b763"
+    },
+    {
+      "path": "config/jade/hide-entities.json",
+      "hash": "548656ff89ad489730a4b5fdf071a6e98fcd5033"
+    },
+    {
+      "path": "config/jade/hide-blocks.json",
+      "hash": "8b3297cc5db5ed84dd48d2905fb21ee3063e0e25"
+    },
+    {
+      "path": "config/jade/plugins.json",
+      "hash": "4c0bf6ed1a86d5540abee0ba6278fcd6f52902eb"
+    },
+    {
+      "path": "config/jade/jade.json",
+      "hash": "2fb491dec13b7ad7d2f47f6b4a5a177efb31031c"
+    },
+    {
+      "path": "config/jade/usernamecache.json",
+      "hash": "796e2b30eb8322eb568512eea576bbce819becbf"
+    },
+    {
+      "path": "config/carpet/default_carpet.conf",
+      "hash": "7e2581abad4491597f710c1b855558f0a2c9e641"
+    },
    {
      "path": "resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip",
-      "hash": "2765483237452abbab8c2998ec3c9d7ab6780e55"
+      "hash": "a221a0eab2004d2e41b429c5a3e6ec7f4e7d400c"
    },
    {
      "path": ".i18nupdatemod/1.20/Minecraft-Mod-Language-Modpack-1-20-Fabric.zip",
-      "hash": "421220413055d10958f334cde9cadd291b975575"
+      "hash": "79d0e23ba334e9a59f106f2ae282da347e53a7a6"
    },
    {
      "path": ".i18nupdatemod/1.19/Minecraft-Mod-Language-Modpack-1-19.zip",
-      "hash": "a5efa80e2f60c6641803bbf8eaebb823492f218f"
+      "hash": "a94fb69cca52a6504f7d1b9ae4d9e28192903ce8"
    },
    {
      "path": ".i18nupdatemod/1.18/Minecraft-Mod-Language-Modpack-1-18-Fabric.zip",
-      "hash": "1d1ca3a5c053a421b496e23683ab3e2f3d2a1ea7"
+      "hash": "45d3fe3b95b4bd9a03852ab8ea9f0d88742e76b2"
    },
    {
      "path": ".i18nupdatemod/1.20.1/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip",
-      "hash": "2765483237452abbab8c2998ec3c9d7ab6780e55"
+      "hash": "a221a0eab2004d2e41b429c5a3e6ec7f4e7d400c"
    },
    {
      "path": "irisUpdateInfo.json",