114514

2024-09-28 00:54:21 +08:00
parent 2392adde62
commit 71c440ba9e
12 changed files with 27 additions and 59 deletions
--- a/package/overrides/config/fabric/indigo-renderer.properties
+++ b/package/overrides/config/fabric/indigo-renderer.properties
@@ -1,5 +1,5 @@
 #Indigo properties file
-#Sat Sep 28 00:24:12 CST 2024
+#Sat Sep 28 00:34:20 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
-#Sat Sep 28 00:24:13 CST 2024
+#Sat Sep 28 00:34:20 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
-#Sat Sep 28 00:24:15 CST 2024
+#Sat Sep 28 00:34:23 CST 2024
 colorSpace=SRGB
 disableUpdateMessage=false
 enableDebugOptions=false
--- 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.
-#Sat Sep 28 00:23:57 CST 2024
+#Sat Sep 28 00:34:05 CST 2024
 decoderSize=838860800
 nbtMaxSize=209715200
 packetSize=104857600
--- a/package/overrides/config/roughlyenoughitems/config.json5
+++ b/package/overrides/config/roughlyenoughitems/config.json5
@@ -243,8 +243,7 @@
 			"shouldFilterDisplays": true,
 			"filteringRules": [
 				"{id:\"roughlyenoughitems:manual\",rule:{}}",
-				"{id:\"roughlyenoughitems:basic\",rule:{}}",
-				"{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}"
+				"{id:\"roughlyenoughitems:basic\",rule:{}}"
 			]
 		}
 	}
--- a/package/overrides/config/xaerominimap_entities.json
+++ b/package/overrides/config/xaerominimap_entities.json
@@ -10,8 +10,8 @@
  "name": "gui.xaero_entity_category_root",
  "protection": true,
  "settingOverrides": {
-    "displayed": true,
    "displayHeight": 0.0,
+    "displayed": true,
    "heightBasedFade": true,
    "renderOrder": 0.0,
    "color": 13.0,
--- a/package/overrides/log4j2.xml
+++ b/package/overrides/log4j2.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="SysOut" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
-        </Console>
-        <Queue name="ServerGuiConsole">
-            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
-        </Queue>
-        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
-            <Policies>
-                <TimeBasedTriggeringPolicy />
-                <OnStartupTriggeringPolicy />
-            </Policies>
-        </RollingRandomAccessFile>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <filters>
-                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-            </filters>
-            <AppenderRef ref="SysOut"/>
-            <AppenderRef ref="File"/>
-        </Root>
-    </Loggers>
-</Configuration>
--- a/package/overrides/mods/createaddition-1.20.1-1.2.4e.jar
+++ b/package/overrides/mods/createaddition-1.20.1-1.2.4e.jar
--- a/package/overrides/mods/createaddition-fabric+1.20.1-1.2.4.jar.old
+++ b/package/overrides/mods/createaddition-fabric+1.20.1-1.2.4.jar.old
--- a/package/overrides/mods/createaddition-fabric+1.20.1-1.2.4.jar
+++ b/package/overrides/mods/createaddition-fabric+1.20.1-1.2.4.jar
--- 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
@@ -1,14 +1,10 @@
 {
-  "name": "nb-mc-re",
+  "name": "nb-mc",
  "author": "azwphy",
-  "version": "1.6.1",
+  "version": "1.6.2",
  "description": "",
  "fileApi": "https://git.azw.net.cn/VTBHelper/nebulabeat-mc/media/branch/main/package",
  "files": [
-    {
-      "path": "log4j2.xml",
-      "hash": "d47d254675d1aee18670aece5ed768e1e631517b"
-    },
    {
      "path": "mods/wats-1.20+1.20.4-Fabric-1.0.7.jar",
      "hash": "f2c7d2898a7318990e03a7a589a4f04f04210832"
@@ -149,10 +145,6 @@
      "path": "mods/chattools-1.20.1-v2.3.4.jar.old",
      "hash": "15c893cc576a8f86baabf2e3ae85d906d085dcad"
    },
-    {
-      "path": "mods/createaddition-fabric+1.20.1-1.2.4.jar.old",
-      "hash": "a4b1618a3a7c14aab3c2fc46017a26c2b668dda3"
-    },
    {
      "path": "mods/FarmersDelight-1.20.1-2.1.4+refabricated.jar.old",
      "hash": "712275d61e57cf2fcd8ae663124d0ba1c397d578"
@@ -189,10 +181,6 @@
      "path": "mods/RoughlyEnoughItems-12.1.780-fabric.jar",
      "hash": "86becb14e7b13a4376872a815a0956a3da3dd2f2"
    },
-    {
-      "path": "mods/createaddition-1.20.1-1.2.4e.jar",
-      "hash": "41f22b70ceb9f61db0306871f2ae9998b25ed4fd"
-    },
    {
      "path": "mods/Xaeros_Minimap_24.4.0_Fabric_1.20.jar",
      "hash": "cae6b004e50ed621b2d88666212d27e604d45f50"
@@ -213,6 +201,14 @@
      "path": "mods/chattools-1.20.1-v2.3.5.jar",
      "hash": "a8dcea829fec478a8f1878dd0aad3d97e7637e2a"
    },
+    {
+      "path": "mods/createaddition-1.20.1-1.2.4e.jar.old",
+      "hash": "41f22b70ceb9f61db0306871f2ae9998b25ed4fd"
+    },
+    {
+      "path": "mods/createaddition-fabric+1.20.1-1.2.4.jar",
+      "hash": "a4b1618a3a7c14aab3c2fc46017a26c2b668dda3"
+    },
    {
      "path": "CustomSkinLoader/CustomSkinAPIPlus-ClientID",
      "hash": "1e35b89ba38346e728c7f8584ee83271647185c8"
@@ -227,7 +223,7 @@
    },
    {
      "path": "config/packetfixer.properties",
-      "hash": "91b544644975c1df41606e6dee655d6ceca39cbc"
+      "hash": "37c8199364acec43e0b39f9dbe183f1393b78f0a"
    },
    {
      "path": "config/sodium-mixins.properties",
@@ -303,7 +299,7 @@
    },
    {
      "path": "config/roughlyenoughitems/config.json5",
-      "hash": "dd9e625f3b9451d19cbf469b0aba5e30e4dcf9b4"
+      "hash": "e9a24bad49de216eb11bdb31fc4f9b6f4ee4d525"
    },
    {
      "path": "config/roughlyenoughitems/favorites.json5",
@@ -359,7 +355,7 @@
    },
    {
      "path": "config/fabric/indigo-renderer.properties",
-      "hash": "f0669abd561d85faf107347a48ac1ee15cdfff60"
+      "hash": "ea285c4eea2a74b327e5dcea0bab33f9c0b3a3b5"
    },
    {
      "path": "config/flywheel.json",
@@ -367,7 +363,7 @@
    },
    {
      "path": "config/indium-renderer.properties",
-      "hash": "c2fc89be311a49d924fad2a22784710df9cc4823"
+      "hash": "f95f872bbe6d05f4f62d48c476e560bdf9f5b76c"
    },
    {
      "path": "config/jecharacters.json",
@@ -407,7 +403,7 @@
    },
    {
      "path": "config/iris.properties",
-      "hash": "0c0aaa13bd79d4f0950e3ceae028a93809d992d6"
+      "hash": "11e0e72cc15aafa94748f27fb43f393121bad1e9"
    },
    {
      "path": "config/jade/sort-order.json",
@@ -495,7 +491,7 @@
    },
    {
      "path": "config/xaerominimap_entities.json",
-      "hash": "acf65351d79fa0764141fcd9d895c0006892fd5c"
+      "hash": "e3e2634df12bfaf51db1784415ce27450e517876"
    },
    {
      "path": "allmusic3/config.json",
@@ -515,7 +511,7 @@
    },
    {
      "path": "resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip",
-      "hash": "973768bbe19867d6b3514492a9bc59227e5720a8"
+      "hash": "2a4fbe430be10d99b2a5916c5e239c1319696f49"
    },
    {
      "path": "patchouli_data.json",