0.0.8-alpha

2024-12-10 06:03:11 +08:00
parent e92b0e5c8b
commit 2bc76518e0
233 changed files with 6676 additions and 890 deletions
--- a/.minecraft/versions/边境流放/config/RuOK.toml
+++ b/.minecraft/versions/边境流放/config/RuOK.toml
@@ -0,0 +1,13 @@
+onCull = true
+maxEntityEntities = 128
+entitiesDistance = 64
+QualityModes = "normal"
+RenderWeather = "normal"
+RenderTNTExplosions = true
+FastItemRender = false
+RenderDisplayItem = false
+blackListedEntities = []
+whiteListedEntities = []
+isAlwaysShowItemCount = true
+startTime = 45.886
+chatFix = false
--- a/.minecraft/versions/边境流放/config/alexsmobs.toml
+++ b/.minecraft/versions/边境流放/config/alexsmobs.toml
--- a/.minecraft/versions/边境流放/config/armourers_workshop-client.toml
+++ b/.minecraft/versions/边境流放/config/armourers_workshop-client.toml
@@ -37,7 +37,6 @@
 	#Range: 16 ~ 512
 	renderDistanceMannequinEquipment = 64
 	#The maximum number of threads that will be used to bake models. 
-	#[range: 1 ~ 16, default: core count / 2]
 	#Range: 1 ~ 16
 	modelBakingThreadCount = 10
 	#When enabled skin will render in multiple passes to reduce visual artifacts.
@@ -49,6 +48,9 @@
 	#Number of LOD models to create. Higher number should give a boost to framerate at a small cost to VRAM.
 	#Range: 0 ~ 4
 	maxLodLevels = 4
+	#The maximum number of threads that will be used to build model vertexes. 
+	#Range: 1 ~ 16
+	vertexCompileThreadCount = 2

 #Change (memory use/IO access) ratio by changing setting in this category.
 [cache]
@@ -105,21 +107,6 @@
 	#Skin preview will be rendered next to the mouse.
 	skinPreLocFollowMouse = true

-#Setting to configure tooltips on skinned items.
-[tooltip]
-	#Show has skin tooltip on skinned items.
-	tooltipHasSkin = true
-	#Show skin name tooltip on items.
-	tooltipSkinName = true
-	#Show skin author tooltip on items.
-	tooltipSkinAuthor = true
-	#Show skin type tooltip on items.
-	tooltipSkinType = true
-	#Show skin flavoue text tooltip on items.
-	tooltipFlavour = true
-	#Show open wardrobe message on skins.
-	tooltipOpenWardrobe = true
-
 #Debug Settings.
 [debug]
 	#Shows shader mixin results in logs.
@@ -137,4 +124,8 @@
 	#3 = model_replace_aw (render using a aw model - faster, less compatible)
 	#Range: -1 ~ 2
 	texturePaintingType = 0
+	#Shows animation running states in logs.
+	animation = false
+	#Shows molang compile states in logs.
+	molang = false

--- a/.minecraft/versions/边境流放/config/armourers_workshop-common.toml
+++ b/.minecraft/versions/边境流放/config/armourers_workshop-common.toml
@@ -33,6 +33,11 @@
 	#2 = always enable
 	#Range: 0 ~ 2
 	enableFirstPersonSkinRenderer = 0
+	#If enabled the server will check permission node in the each operation.
+	#Highly recommended in the forge server.
+	enablePermissionCheck = true
+	#If enabled the server will allow client use server skins in the resource pack.
+	enableServerSkinsInResourcePack = false

 #Setting for the players wardrobe.
 [wardrobe]
@@ -60,6 +65,8 @@
 	#2 = always drop
 	#Range: 0 ~ 2
 	playerDropSkinsOnDeath = 0
+	#Only allows the player place to skin item into slots.
+	onlySkinIntoSlots = false

 #Setting for the library blocks.
 [library]
@@ -107,3 +114,37 @@
 	#If the matching system wrong, you can add the item id here to this ignore it.
 	matchingBlacklistByItemId = []

+#Setting to configure tooltips on skinned items.
+[tooltip]
+	#Show has skin tooltip on skinned items.
+	tooltipHasSkin = true
+	#Show skin name tooltip on items.
+	tooltipSkinName = true
+	#Show skin author tooltip on items.
+	tooltipSkinAuthor = true
+	#Show skin type tooltip on items.
+	tooltipSkinType = true
+	#Show skin flavour text tooltip on items.
+	tooltipFlavour = true
+	#Show skin preview tooltip on items.
+	tooltipSkinPreview = true
+	#Show open wardrobe message on skins.
+	tooltipOpenWardrobe = true
+
+#Setting for the Database.
+[database]
+	#Save/Load skin data for the database.
+	#example1: "jdbc:mysql://<localhost>[:3306]/<database>[?user=<username>][&password=<password>]"
+	#example2: "jdbc:sqlite://</path/name.db>"
+	skin = ""
+	#Use fallback when database is specified.
+	#0 = enable
+	#1 = disable
+	#2 = migrate to database
+	#Range: 0 ~ 2
+	fallback = 0
+	#Keep alive time check when database is specified.
+	#the unit is seconds, 0 is disabled.
+	#Range: 0 ~ 86400
+	keepalive = 600
+
--- a/.minecraft/versions/边境流放/config/autofish.config
+++ b/.minecraft/versions/边境流放/config/autofish.config
@@ -0,0 +1,13 @@
+{
+  "isAutofishEnabled": true,
+  "multiRod": false,
+  "isOpenWaterDetectEnabled": true,
+  "noBreak": false,
+  "persistentMode": false,
+  "useSoundDetection": false,
+  "forceMPDetection": false,
+  "recastDelay": 1500,
+  "randomPercent": 50,
+  "reelInDelay": 1,
+  "clearLagRegex": "\\[ClearLag\\] Removed [0-9]+ Entities!"
+}
--- a/.minecraft/versions/边境流放/config/betterendisland-forge-1_20.toml
+++ b/.minecraft/versions/边境流放/config/betterendisland-forge-1_20.toml
@@ -0,0 +1,9 @@
+
+["YUNG's Better End Island"]
+	# Whether the Ender Dragon drops an egg when every time it's defeated.
+	# Default: false
+	"Resummoned Dragon Drops Egg" = false
+	# Whether the vanilla obsidian platform should spawn in the End instead of the revamped platform.
+	# Default: false
+	"Spawn Vanilla Obsidian Platform" = false
+
--- a/.minecraft/versions/边境流放/config/cataclysm.toml
+++ b/.minecraft/versions/边境流放/config/cataclysm.toml
@@ -11,7 +11,7 @@
 	"custombossbar(on/off)" = true
 	#BossMusic(on/off)
 	"BossMusic(on/off)" = true
-	#BossMusicVolume
+	#BossMusicVolume(denominator)
 	#Range: 1 ~ 1000000
 	BossMusicVolume = 2

@@ -51,6 +51,15 @@
 	#Sandstorm's Timer
 	#Range: 0 ~ 1000000
 	SandstormTimer = 160
+	#Soul Render's Timer
+	#Range: 0 ~ 1000000
+	SoulRenderCooldown = 100
+	#Gauntlet of Maelstrom's Timer
+	#Range: 0 ~ 1000000
+	gauntletofMaelstromCooldown = 180
+	#The Immolator's Timer
+	#Range: 0 ~ 1000000
+	immolatorCooldown = 300

 ["Entity damage"]
 	#Void Rune's Damage
@@ -63,9 +72,9 @@
 	#Range: 0.0 ~ 1000000.0
 	DeathLaserdamage = 5.0
 	#Death Laser's Hp Damage
-	#Range: 0.0 ~ 1.0
+	#Range: 0.0 ~ 100.0
 	DeathLaserHpdamage = 0.05
-	#Laser's Damage
+	#Player's Laser's Damage
 	#Range: 0.0 ~ 1000000.0
 	Laserdamage = 4.0
 	#Blazing Bone's Damage
@@ -104,6 +113,15 @@
 	#Ancient Desert Stele's Damage
 	#Range: 0.0 ~ 1000000.0
 	"Ancient Desert Stele Damage" = 18.0
+	#Player's Phantom Arrow's Damage
+	#Range: 0.0 ~ 1000000.0
+	"Phantom Arrow Damage" = 5.0
+	#Phantom Halberd's Damage
+	#Range: 0.0 ~ 1000000.0
+	"Phantom Halberd Damage" = 12.0
+	#Cursed Sandstorm's Damage
+	#Range: 0.0 ~ 1000000.0
+	"Cursed Sandstorm Damage" = 6.0

 ["Ender Guardian"]
 	#EnderGuardian's Health Multiplier
@@ -113,7 +131,7 @@
 	#Range: 0.0 ~ 1000000.0
 	EnderGuardianDamageMultiplier = 1.0
 	#EnderGuardian's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	EnderGuardianDamageCap = 22
 	#Ender guardian's block breaking ignore the MobGriefing
 	EnderguardianBlockBreaking = true
@@ -147,6 +165,9 @@
 	#EnderGuardianBlockBreaking radius
 	#Range: 0 ~ 20
 	"EnderGuardianBlockBreaking Z" = 15
+	#EnderGuardian's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	EnderGuardianNatureHealing = 10.0

 ["Netherite Monstrosity"]
 	#Monstrosity's Lavabomb magazine.
@@ -165,7 +186,7 @@
 	#Range: 0.0 ~ 1000000.0
 	MonstrosityHealingMultiplier = 1.0
 	#Monstrosity's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	MonstrosityDamageCap = 22
 	#Monstrosity's bodyBlocking verdict
 	NetheritemonstrosityBodyBloking = true
@@ -175,6 +196,9 @@
 	#Monstrosity's Immune to Long distance attack range.
 	#Range: 1.0 ~ 1000000.0
 	"Monstrosity's prevent attacks from far away Range" = 18.0
+	# Monstrosity's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	MonstrosityNatureHealing = 10.0

 ["Ender Golem"]
 	#Ender Golem's block breaking ignore the MobGriefing
@@ -203,10 +227,13 @@
 	#Range: 1.0 ~ 1000000.0
 	"Ignis's prevent attacks from far away Range" = 15.0
 	#Ignis's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	IgnisDamageCap = 20
 	#Ignis's cracked block breaking ignore the MobGriefing
 	IgnisBlockBreaking = true
+	#Ignis's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	IgnisNatureHealing = 10.0

 [revenant]
 	#Revenant's Health Multiplier
@@ -230,7 +257,7 @@
 	#Range: 1.0 ~ 1000000.0
 	"The Harbinger's prevent attacks from far away Range" = 35.0
 	#Harbinger's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	"The Harbinger DamageCap" = 22
 	#Harbinger's lasers can light a fire in MobGriefing
 	"The Harbinger Light A Fire" = true
@@ -240,6 +267,9 @@
 	#Harbinger's Wither Missile's Damage
 	#Range: 0.0 ~ 1000000.0
 	"Harbinger's WitherMissiledamage" = 8.0
+	#Harbinger's laser's Damage
+	#Range: 0.0 ~ 1000000.0
+	"Harbinger's laser damage" = 5.0

 ["The Leviathan"]
 	#Leviathan's Health Multiplier
@@ -264,12 +294,15 @@
 	#Range: 0.0 ~ 1.0
 	"Leviathan's Tentacle Hp Damage" = 0.03
 	#Leviathan's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	LeviathanDamageCap = 20
 	#Leviathan's block breaking ignore the MobGriefing
 	LeviathanBlockBreaking = true
 	#Leviathan Immune Out of Water
 	LeviathanImmuneOutofWater = true
+	#Leviathan's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	LeviathanNatureHealing = 10.0

 ["The Baby Leviathan"]
 	#BabyLeviathan's Health Multiplier
@@ -310,6 +343,30 @@
 	#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
 	#Range: > 0
 	KoboletonSpawnRolls = 30
+	#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
+	#Range: 0 ~ 1000
+	DeeplingPriestSpawnWeight = 1
+	#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
+	#Range: > 0
+	DeeplingPriestSpawnRolls = 70
+	#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
+	#Range: 0 ~ 1000
+	DeeplingWarlockSpawnWeight = 1
+	#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
+	#Range: > 0
+	DeeplingWarlockSpawnRolls = 70
+	#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
+	#Range: 0 ~ 1000
+	CoralgolemSpawnWeight = 1
+	#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
+	#Range: > 0
+	CoralgolemSpawnRolls = 70
+	#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
+	#Range: 0 ~ 1000
+	IgnitedBerserkerSpawnWeight = 1
+	#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
+	#Range: > 0
+	IgnitedBerserkerSpawnRolls = 30

 ["Amethyst Crab"]
 	#Amethyst Crab's Health Multiplier
@@ -318,6 +375,9 @@
 	#Amethyst Crab's Damage Multiplier
 	#Range: 0.0 ~ 1000000.0
 	AmethystCrabDamageMultiplier = 1.0
+	#Amethyst Crab's EarthQuake Damage
+	#Range: 0.0 ~ 1000000.0
+	AmethystCrabEarthQuakeDamage = 5.0

 ["Ancient Remnant"]
 	#Ancient Remnant's Health Multiplier
@@ -330,7 +390,7 @@
 	#Range: 1.0 ~ 1000000.0
 	"Ancient Remnant's prevent attacks from far away Range" = 15.0
 	#Ancient Remnant's DamageCap
-	#Range: 0 ~ 1000000
+	#Range: 0.0 ~ 1000000.0
 	AncientRemnantCap = 21
 	#Ancient Remnant's block breaking ignore the MobGriefing
 	AncientRemnantBlockBreaking = true
@@ -343,6 +403,12 @@
 	#Remnant's Stomp Hp Damage
 	#Range: 0.0 ~ 1.0
 	"Remnant's Stomp Hp Damage" = 0.03
+	#Remnant's EarthQuake Damage
+	#Range: 0.0 ~ 1000000.0
+	"Remnant's EarthQuakeDamage" = 8.0
+	#AncientRemnant's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	AncientRemnantNatureHealing = 10.0

 ["The Prowler"]
 	#The Prowler's Immune to Long distance attack range.
@@ -368,3 +434,85 @@
 	#Range: 0.0 ~ 100.0
 	CauseKoboletontoDropItemInHandPercent = 5.0

+[Kobolediator]
+	#Kobolediator's block breaking ignore the MobGriefing
+	KobolediatorBlockBreaking = false
+	#Kobolediator's Health Multiplier
+	#Range: 0.0 ~ 1000000.0
+	KobolediatorHealthMultiplier = 1.0
+	#Kobolediator's Damage Multiplier
+	#Range: 0.0 ~ 1000000.0
+	KobolediatorDamageMultiplier = 1.0
+
+[Maledictus]
+	#Maledictus's Health Multiplier
+	#Range: 0.0 ~ 1000000.0
+	MaledictusHealthMultiplier = 1.0
+	#Maledictus's Damage Multiplier
+	#Range: 0.0 ~ 1000000.0
+	MaledictusDamageMultiplier = 1.0
+	#Maledictus's DamageCap
+	#Range: 0.0 ~ 1000000.0
+	MaledictusDamageCap = 20.0
+	#Maledictus's melee Hp Damage
+	#Range: 0.0 ~ 1.0
+	"Maledictus's melee Hp Damage" = 0.05
+	#Maledictus's Shock wave Hp Damage
+	#Range: 0.0 ~ 1.0
+	"Maledictus's Shock Wave Hp Damage" = 0.03
+	#Maledictus's AOE Hp Damage
+	#Range: 0.0 ~ 1.0
+	"Maledictus's AOE Hp Damage" = 0.15
+	#Maledictus's flying Smash Hp Damage
+	#Range: 0.0 ~ 1.0
+	"Maledictus's Flying Smash Hp Damage" = 0.1
+	#Maledictus's Jump Smash Hp Damage
+	#Range: 0.0 ~ 1.0
+	"Maledictus's Jump Smash Hp Damage" = 0.08
+	#Maledictus's Immune to Long distance attack range.
+	#Range: 1.0 ~ 1000000.0
+	"Maledictus's prevent attacks from far away Range" = 12.0
+	#Maledictus's Healing with out target
+	#Range: 0.0 ~ 1000000.0
+	MaledictusNatureHealing = 10.0
+	#Maledictus's Phantom Halberd Damage
+	#Range: 0.0 ~ 1000000.0
+	"Maledictus' Phantom Halberd Damage'" = 10.0
+	#Maledictus's Phantom Arrow's Damage
+	#Range: 0.0 ~ 1000000.0
+	"Maledictus's Phantom Arrow Damage" = 5.0
+	#Maledictus's cracked block breaking ignore the MobGriefing
+	MaledictusBlockBreaking = true
+
+["World Generation"]
+	#Defines the area in which the structure check for height variances (1 means 9 chunks will be checked (center + area around it)) - 0 disables this check
+	#Range: 0 ~ 5
+	cursedPyramidCheckRange = 2
+	#Allowed height variance for the check - if the variance is lower than this value the structure will not spawn (has no effect if the are check is disabled)
+	#Range: 0 ~ 32
+	cursedPyramidHeightVariance = 2
+
+[Block]
+	#Cursed Tombstone Summon cooldown Minute
+	#Range: 3 ~ 300
+	"Cursed Tombstone Summon cooldown Minute" = 30
+
+[Wadjet]
+	#Wadjet's Health Multiplier
+	#Range: 0.0 ~ 1000000.0
+	WadjetHealthMultiplier = 1.0
+	#Wadjet's Damage Multiplier
+	#Range: 0.0 ~ 1000000.0
+	WadjetDamageMultiplier = 1.0
+
+[Aptrgangr]
+	#Aptrgangr's Health Multiplier
+	#Range: 0.0 ~ 1000000.0
+	AptrgangrHealthMultiplier = 1.0
+	#Aptrgangr's Damage Multiplier
+	#Range: 0.0 ~ 1000000.0
+	AptrgangrDamageMultiplier = 1.0
+	#Axe Blade's Damage
+	#Range: 0.0 ~ 1000000.0
+	AptrgangrAxeBladeDamage = 8.0
+
--- a/.minecraft/versions/边境流放/config/cataclysm/coral_golem_spawns.json
+++ b/.minecraft/versions/边境流放/config/cataclysm/coral_golem_spawns.json
@@ -0,0 +1,53 @@
+{
+  "biomes": [
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_cold_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:warm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "alexscaves:abyssal_chasm"
+      }
+    ]
+  ]
+}
--- a/.minecraft/versions/边境流放/config/cataclysm/deepling_priest_spawns.json
+++ b/.minecraft/versions/边境流放/config/cataclysm/deepling_priest_spawns.json
@@ -0,0 +1,53 @@
+{
+  "biomes": [
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_cold_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:warm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "alexscaves:abyssal_chasm"
+      }
+    ]
+  ]
+}
--- a/.minecraft/versions/边境流放/config/cataclysm/deepling_warlock_spawns.json
+++ b/.minecraft/versions/边境流放/config/cataclysm/deepling_warlock_spawns.json
@@ -0,0 +1,53 @@
+{
+  "biomes": [
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:deep_cold_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:lukewarm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "minecraft:warm_ocean"
+      }
+    ],
+    [
+      {
+        "type": "REGISTRY_NAME",
+        "negate": false,
+        "value": "alexscaves:abyssal_chasm"
+      }
+    ]
+  ]
+}
--- a/.minecraft/versions/边境流放/config/curios-client.toml
+++ b/.minecraft/versions/边境流放/config/curios-client.toml
@@ -18,4 +18,6 @@
 	#The corner for the Curios GUI button
 	#Allowed Values: TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT
 	buttonCorner = "TOP_LEFT"
+	#Set to true to enable the Curios GUI button
+	enableButton = true

--- a/.minecraft/versions/边境流放/config/curios-common.toml
+++ b/.minecraft/versions/边境流放/config/curios-common.toml
@@ -0,0 +1,5 @@
+#List of slots to create or modify.
+#See documentation for syntax: https://docs.illusivesoulworks.com/curios/configuration#slot-configuration
+#
+slots = []
+
--- a/.minecraft/versions/边境流放/config/default.json
+++ b/.minecraft/versions/边境流放/config/default.json
@@ -0,0 +1,53 @@
+{
+  "enableDropsForNonPlayer": true,
+  "enableCrashExplosion": true,
+  "enableCrashBlockDestruction": false,
+  "enableCrashFire": false,
+  "crashExplosionRadius": 2.0,
+  "crashDamage": 2.0,
+  "preventKillThroughCrash": true,
+  "healthBarRow": 0,
+  "damagePerHealthPoint": 30,
+  "separateCamera": true,
+  "useThirdPersonByDefault": true,
+  "enableTrails": true,
+  "renderDistance": 192.0,
+  "fuelConsumption": 1.0,
+  "windClearWeather": 1.0,
+  "windRainWeather": 3.0,
+  "windThunderWeather": 3.0,
+  "repairSpeed": 0.025,
+  "repairExhaustion": 0.5,
+  "collisionDamage": true,
+  "collisionDamageMultiplier": 40.0,
+  "burnFuelInCreative": false,
+  "acceptVanillaFuel": true,
+  "useCustomKeybindSystem": true,
+  "showHotbarEngineGauge": true,
+  "weaponsAreDestructive": false,
+  "dropInventory": true,
+  "dropUpgrades": false,
+  "regenerateHealthEveryNTicks": 0,
+  "requireShiftForRepair": false,
+  "fuelList": {
+    "minecraft:blaze_powder": 1200
+  },
+  "validDimensions": {
+    "minecraft:the_nether": true,
+    "minecraft:overworld": true,
+    "minecraft:the_end": true
+  },
+  "gunpowderAmmunition": {
+    "minecraft:gunpowder": 100
+  },
+  "arrowAmmunition": {
+    "minecraft:tipped_arrow": 100,
+    "minecraft:arrow": 100,
+    "minecraft:spectral_arrow": 100
+  },
+  "bombBayAmmunition": {
+    "minecraft:tnt": 100
+  },
+  "version": 1,
+  "name": "default"
+}
--- a/.minecraft/versions/边境流放/config/dimdungeons-common-r190.toml
+++ b/.minecraft/versions/边境流放/config/dimdungeons-common-r190.toml
--- a/.minecraft/versions/边境流放/config/embeddium++.toml
+++ b/.minecraft/versions/边境流放/config/embeddium++.toml
@@ -0,0 +1,176 @@
+
+[embeddiumplus]
+
+	[embeddiumplus.general]
+		#Configure FPS Display mode
+		#Complete mode gives you min FPS count and average count
+		#Allowed Values: OFF, SIMPLE, ADVANCED
+		fpsDisplay = "OFF"
+		#Shows GPU and memory usage onto FPS display
+		#Allowed Values: OFF, ON, GPU, RAM
+		fpsDisplaySystem = "OFF"
+		#Set Fullscreen mode
+		#Borderless let you change between screens more faster and move your mouse across monitors
+		#Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN
+		fullscreen = "WINDOWED"
+		#Configure FPS Display gravity
+		#Places counter on specified corner of your screen
+		#Allowed Values: LEFT, CENTER, RIGHT
+		fpsDisplayGravity = "CENTER"
+		#Toggle FPS Display shadow
+		#In case sometimes you can't see the text
+		fpsDisplayShadow = false
+		#Configure FPS Display margin
+		#Give some space between corner and text
+		#Range: 0 ~ 48
+		fpsDisplayMargin = 12
+
+	[embeddiumplus.performance]
+		#Toggles JREI item rendering until searching
+		#Increases performance a little bit and cleans your screen when you don't want to use it
+		hideJREI = false
+		#Sets culling mode
+		#Reduces number of visible faces when the neighbor blocks are leaves
+		#Allowed Values: ALL, OFF
+		leavesCulling = "OFF"
+		#Toggles Minecraft Fonts shadows
+		#Depending of the case may increase performance
+		#Gives a flat style text
+		fontShadows = true
+
+		[embeddiumplus.performance.distanceCulling]
+
+			[embeddiumplus.performance.distanceCulling.entities]
+				#Configure horizontal max distance before cull entities
+				#Value is squared, default was 64^2 (or 64x64)
+				#Range: > 0
+				cullingMaxDistanceX = 4096
+				#Toggles distance culling for entities, doesn't affect monsters culling
+				#Check the options below
+				enable = true
+				#Configure vertical max distance before cull entities
+				#Value is raw
+				#Range: 0 ~ 512
+				cullingMaxDistanceY = 32
+				#List of all Entities to be ignored by distance culling
+				#Uses ResourceLocation to identify it
+				#Example 1: "minecraft:bat" - Ignores bats only
+				#Example 2: "alexsmobs:*" - ignores all entities for alexmobs mod
+				whitelist = ["minecraft:ghast", "minecraft:ender_dragon", "iceandfire:*", "create:*"]
+
+				[embeddiumplus.performance.distanceCulling.entities.monsters]
+					#Configure horizontal max distance before cull monster entities
+					#Value is squared, default was 64^2 (or 64x64)
+					#Range: > 0
+					cullingMaxDistanceX = 16384
+					#Toggles distance culling for monsters (or hostile entities, whatever you want to call it), doesn't affect neutral/pacific entities
+					#Check the options above
+					enable = false
+					#Configure vertical max distance before cull monster entities
+					#Value is raw
+					#Range: 0 ~ 512
+					cullingMaxDistanceY = 64
+					#List of all monster entities to be ignored by distance culling
+					#Uses ResourceLocation to identify it
+					#Example 1: "minecraft:bat" - Ignores bats only
+					#Example 2: "alexsmobs:*" - ignores all entities for alexmobs mod
+					whitelist = ["minecraft:ghast", "minecraft:ender_dragon", "iceandfire:*", "create:*"]
+
+			[embeddiumplus.performance.distanceCulling.tileEntities]
+				#Configure horizontal max distance before cull Block entities
+				#Value is squared, default was 64^2 (or 64x64)
+				#Range: > 0
+				cullingMaxDistanceX = 4096
+				#Toggles distance culling for Block Entities
+				#Maybe you use another mod for that :(
+				enable = true
+				#Configure vertical max distance before cull Block entities
+				#Value is raw
+				#Range: 0 ~ 512
+				cullingMaxDistanceY = 32
+				#List of all Block Entities to be ignored by distance culling
+				#Uses ResourceLocation to identify it
+				#Example 1: "minecraft:chest" - Ignores chests only
+				#Example 2: "ae2:*" - ignores all Block entities from Applied Energetics 2
+				whitelist = ["waterframes:*"]
+
+		[embeddiumplus.performance.fastModels]
+			#Toggles FastBeds feature
+			enableBeds = false
+			#Toggles FastChest feature
+			#Without flywheel installed or using any backend, it increases FPS significatly on chest rooms
+			enableChests = false
+
+	[embeddiumplus.dynlights]
+		#Toggle if Block Entities should have dynamic lights
+		onTileEntities = true
+		#Configure how fast light whould be updated
+		#Allowed Values: OFF, SLOW, NORMAL, FAST, SUPERFAST, FASTESTS, REALTIME
+		updateSpeed = "REALTIME"
+		#Toggle if Entities should have dynamic lights
+		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 = "ATTACH"
+		#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
+		#Allowed Values: OFF, FAST, SLOW
+		chunkFadeSpeed = "SLOW"
+		#Clean my skies
+		#Blue band was a vanilla feature, toggle off will show sky color directly
+		blueBand = true
+		#Raise clouds
+		#Modify clouds height perfect for a adaptative world experience
+		#Range: 0 ~ 512
+		cloudsHeight = 192
+		#Do not show me your name
+		#disables nametag rendering for players and entities
+		disableNameTagRendering = false
+		#Toggle fog feature
+		#Fog was a vanilla feature
+		fog = true
+
+		[embeddiumplus.quality.darkness]
+			#Configure fog brightness on nether when darkness is enabled
+			#Range: 0.0 ~ 1.0
+			endFogBright = 0.5
+			#Configure min moon brightness level with darkness
+			#Range: 0.0 ~ 1.0
+			newMoonBright = 0.0
+			#Toggle Darkness on End dimension
+			enableOnEnd = false
+			#Toggle Darkness default mode for modded dimensions
+			valueByDefault = false
+			#Configure Darkness Mode
+			#Each config changes what is considered 'true darkness'
+			#Allowed Values: TOTAL_DARKNESS, PITCH_BLACK, DARK, DIM, OFF
+			mode = "OFF"
+			#Toggles if moon phases affects darkness in the overworld
+			affectedByMoonPhase = true
+			#List of all dimensions to use True Darkness
+			#This option overrides 'valueByDefault' state
+			dimensionWhitelist = []
+			#Configure max moon brightness level with darkness
+			#Range: 0.0 ~ 1.0
+			fullMoonBright = 0.25
+			#Configure fog brightness on nether when darkness is enabled
+			#Range: 0.0 ~ 1.0
+			netherFogBright = 0.5
+			#Toggle Darkness on Nether dimension
+			enableOnNether = false
+			#Toggle darkness when dimension has no SkyLight
+			enableOnNoSkyLight = false
+			#Disables all bright sources of darkness like moon or fog
+			#Only affects darkness effect
+			enableBlockLightOnly = false
+			#Toggle Darkness on Overworld dimension
+			enableOnOverworld = true
+
--- a/.minecraft/versions/边境流放/config/embeddium-fingerprint.json
+++ b/.minecraft/versions/边境流放/config/embeddium-fingerprint.json
@@ -1 +1 @@
-{"v":1,"s":"37ea921e318f4064ec6dc95325edd39f1a9c18e12e0cce7c7074ea9f3a1a862825244aabf18b1e710ba81422ae4210561482711b5a72729565d1bdf7c30dda16","u":"bbba722f273dfed308209874cc8301761167a03254a79b146ee04f7f9be21bfead8bbed99ef5bf1931c5dae92f37c98f840c1d28e01c5b15612c7e870915ebf1","p":"2d14604a8f2ba496c54d847d41f9656804eb73c7f3260d87cea196bf98c9c60cfc801c78eccd2da79fc542f4eb8919687a47604c0ab774290fc69ba5c69956b7","t":1708161335}
+{"v":1,"s":"f05d8a99158c57723f5b2ff17804bea21e2c26e5e9921c91081054ce5fb7322214e8229532826f02151df9ecde045e47ca393d657aa39c9ab43dd75738131751","u":"ce2dd66bd45033d0346415b5a3068225db89bac1207a20bea65293ea54ec731574581575044c99eec05219d62240dd87d53175014c0c0f15d0890726fb069edf","p":"ea1eb8be6b205d9470b2f00298c8dfdc24e91f49ed87d4a7bffc9dc6bb981c7009b493633358b43b75a0bb518fc77105c6cc739a54bec1ebf266bc9e0c244578","t":1733780111}
--- a/.minecraft/versions/边境流放/config/embeddium-options.json
+++ b/.minecraft/versions/边境流放/config/embeddium-options.json
@@ -2,7 +2,8 @@
  "quality": {
    "weather_quality": "FANCY",
    "leaves_quality": "FANCY",
-    "enable_vignette": true
+    "enable_vignette": true,
+    "use_quad_normals_for_shading": false
  },
  "advanced": {
    "enable_memory_tracing": false,
@@ -18,12 +19,12 @@
    "use_fog_occlusion": true,
    "use_block_face_culling": true,
    "use_compact_vertex_format": true,
-    "use_translucent_face_sorting": true,
+    "use_translucent_face_sorting_v2": true,
    "use_no_error_g_l_context": true
  },
  "notifications": {
    "force_disable_donation_prompts": false,
-    "has_cleared_donation_button": true,
-    "has_seen_donation_prompt": true
+    "has_cleared_donation_button": false,
+    "has_seen_donation_prompt": false
  }
 }
--- a/.minecraft/versions/边境流放/config/enchantinginfuser-server.toml
+++ b/.minecraft/versions/边境流放/config/enchantinginfuser-server.toml
@@ -200,5 +200,5 @@
 [integration]
 	#Enable compat for Apotheosis if it is installed. Allows for using the full range of changes Apotheosis applies to vanilla enchantments.
 	#Should only really be disabled if compat breaks due to internal changes.
-	apotheosis = true
+	apotheosis_integration = true

--- a/.minecraft/versions/边境流放/config/enchdesc.json
+++ b/.minecraft/versions/边境流放/config/enchdesc.json
@@ -3,5 +3,8 @@
  "onlyDisplayOnBooks": false,
  "onlyDisplayInEnchantingTable": false,
  "requireKeybindPress": false,
-  "indentSize": 0
+  "indentSize": 0,
+  "style": {
+    "color": "dark_gray"
+  }
 }
--- a/.minecraft/versions/边境流放/config/entityculling.json
+++ b/.minecraft/versions/边境流放/config/entityculling.json
@@ -1,5 +1,5 @@
 {
-  "configVersion": 5,
+  "configVersion": 6,
  "renderNametagsThroughWalls": true,
  "blockEntityWhitelist": [
    "create:rope_pulley",
@@ -25,7 +25,10 @@
    "create:gantry_contraption",
    "minecraft:boat",
    "minecraft:firework_rocket",
-    "create:carriage_contraption"
+    "create:carriage_contraption",
+    "mts:builder_existing",
+    "mts:builder_rendering",
+    "mts:builder_seat"
  ],
  "disableF3": false,
  "skipEntityCulling": false,
--- a/.minecraft/versions/边境流放/config/fancymenu/options.txt
+++ b/.minecraft/versions/边境流放/config/fancymenu/options.txt
@@ -7,6 +7,7 @@ B:force_fullscreen = 'false';

 ##[customization]

+B:modpack_mode = 'false';
 B:show_customization_overlay = 'false';
 B:advanced_customization_mode = 'false';

@@ -71,4 +72,9 @@ B:debug_overlay_show_basic_screen_category = 'true';
 B:debug_overlay_show_system_category = 'true';
 B:debug_overlay_show_advanced_screen_category = 'true';
 B:show_debug_overlay = 'false';
-B:debug_overlay_show_resources_category = 'true';
+B:debug_overlay_show_resources_category = 'true';
+
+
+##[tutorial]
+
+B:show_welcome_screen = 'false';
--- a/.minecraft/versions/边境流放/config/firstperson.json
+++ b/.minecraft/versions/边境流放/config/firstperson.json
@@ -5,8 +5,9 @@
  "sneakXOffset": 0,
  "sitXOffset": 0,
  "renderStuckFeatures": true,
-  "vanillaHands": false,
-  "doubleHands": false,
+  "vanillaHandsMode": "OFF",
+  "dynamicMode": true,
+  "vanillaHandsSkipSwimming": true,
  "autoVanillaHands": [
    "create:potato_cannon",
    "create:handheld_worldshaper",
--- a/.minecraft/versions/边境流放/config/fml.toml
+++ b/.minecraft/versions/边境流放/config/fml.toml
@@ -1,5 +1,5 @@
 #Early window height
-earlyWindowHeight = 861
+earlyWindowHeight = 900
 #Early window framebuffer scale
 earlyWindowFBScale = 1
 #Enable forge global version checking
@@ -7,7 +7,7 @@ versionCheck = true
 #Early window provider
 earlyWindowProvider = "fmlearlywindow"
 #Early window width
-earlyWindowWidth = 1598
+earlyWindowWidth = 1600
 #Early window starts maximized
 earlyWindowMaximized = false
 #Default config path for servers
--- a/.minecraft/versions/边境流放/config/inventoryprofilesnext/测试/prev-villager-trading-config.json
+++ b/.minecraft/versions/边境流放/config/inventoryprofilesnext/测试/prev-villager-trading-config.json
@@ -29,6 +29,8 @@
        "nitwit": [
        ],
        "none": [
+        ],
+        "mca.guard": [
        ]
    },
    "globalBookmarks1": {
@@ -61,6 +63,8 @@
        "nitwit": [
        ],
        "none": [
+        ],
+        "mca.guard": [
        ]
    },
    "globalBookmarks2": {
@@ -93,6 +97,8 @@
        "nitwit": [
        ],
        "none": [
+        ],
+        "mca.guard": [
        ]
    }
 }
--- a/.minecraft/versions/边境流放/config/jade/plugins.json
+++ b/.minecraft/versions/边境流放/config/jade/plugins.json
@@ -4,7 +4,6 @@
    "furnace": true,
    "harvest_tool.show_unbreakable": false,
    "animal_owner": true,
-    "animal_owner.fetch_names": true,
    "harvest_tool.effective_tool": true,
    "item_storage.normal_amount": 9,
    "item_storage": true,
@@ -20,6 +19,7 @@
    "crop_progress": true,
    "command_block": true,
    "mob_growth": true,
+    "waxed": true,
    "harvest_tool.new_line": false,
    "entity_health.max_for_render": 40,
    "entity_health.show_fractions": false,
@@ -55,7 +55,8 @@
    "equipment_requirement": ""
  },
  "touhou_little_maid": {
-    "maid": true
+    "maid": true,
+    "shrine_lamp": true
  },
  "twilightforest": {
    "quest_ram_wool": true
--- a/.minecraft/versions/边境流放/config/jade/sort-order.json
+++ b/.minecraft/versions/边境流放/config/jade/sort-order.json
@@ -1,115 +1,69 @@
 {
-  "minecraft:brewing_stand": null,
-  "minecraft:beehive": null,
-  "minecraft:command_block": null,
-  "minecraft:jukebox": null,
-  "minecraft:lectern": null,
-  "minecraft:redstone": null,
-  "minecraft:furnace": null,
-  "minecraft:chiseled_bookshelf": null,
-  "minecraft:animal_owner": null,
-  "minecraft:potion_effects": null,
-  "minecraft:mob_growth": null,
-  "minecraft:mob_breeding": null,
-  "minecraft:chicken_egg": null,
-  "minecraft:zombie_villager": null,
-  "minecraft:block_states": null,
-  "minecraft:horse_stats": null,
-  "minecraft:item_frame": null,
-  "minecraft:tnt_stability": null,
-  "minecraft:note_block": null,
-  "minecraft:armor_stand": null,
-  "minecraft:painting": null,
-  "minecraft:harvest_tool": null,
-  "minecraft:enchantment_power": null,
-  "minecraft:total_enchantment_power": null,
-  "minecraft:player_head": null,
-  "minecraft:item_ber": null,
-  "minecraft:villager_profession": null,
-  "minecraft:item_tooltip": null,
-  "minecraft:falling_block": null,
-  "minecraft:entity_health": null,
-  "minecraft:entity_armor": null,
-  "minecraft:crop_progress": null,
-  "minecraft:mob_spawner": null,
-  "minecraft:item_display": null,
-  "minecraft:block_display": null,
-  "minecraft:item_storage": null,
-  "minecraft:fluid_storage": null,
-  "minecraft:energy_storage": null,
-  "minecraft:progress": null,
-  "jade:object_name": null,
-  "jade:registry_name": null,
-  "jade:mod_name": null,
-  "jade:distance": null,
-  "jade:block_face": null,
-  "twilightforest:quest_ram_wool": null,
-  "waystones:waystone": null,
-  "tombstone:graves": null,
-  "lootr:info": null,
-  "lootr:inventory": null,
+  "corpse:corpse": null,
+  "create:backtank_capacity": null,
  "create:blaze_burner": null,
-  "create:copper_backtank": null,
  "create:contraption_inv": null,
-  "create:hide_boiler_tanks": null,
+  "create:copper_backtank": null,
  "create:crafting_blueprint": null,
-  "create:placard": null,
  "create:exact_block": null,
  "create:filter": null,
  "create:goggles": null,
-  "touhou_little_maid:maid": null,
-  "create:backtank_capacity": null,
-  "minecraft:campfire": null,
-  "corpse:corpse": null,
-  "twilightforest:quest_ram_wool": null,
-  "corpse:corpse": null,
-  "touhou_little_maid:maid": null,
-  "lootr:info": null,
-  "lootr:inventory": null,
-  "waystones:waystone": null,
-  "minecraft:brewing_stand": null,
-  "minecraft:beehive": null,
-  "minecraft:command_block": null,
-  "minecraft:jukebox": null,
-  "minecraft:lectern": null,
-  "minecraft:redstone": null,
-  "minecraft:furnace": null,
-  "minecraft:chiseled_bookshelf": null,
-  "minecraft:animal_owner": null,
-  "minecraft:potion_effects": null,
-  "minecraft:mob_growth": null,
-  "minecraft:mob_breeding": null,
-  "minecraft:chicken_egg": null,
-  "minecraft:zombie_villager": null,
-  "minecraft:campfire": null,
-  "minecraft:block_states": null,
-  "minecraft:horse_stats": null,
-  "minecraft:item_frame": null,
-  "minecraft:tnt_stability": null,
-  "minecraft:note_block": null,
-  "minecraft:armor_stand": null,
-  "minecraft:painting": null,
-  "minecraft:harvest_tool": null,
-  "minecraft:enchantment_power": null,
-  "minecraft:total_enchantment_power": null,
-  "minecraft:player_head": null,
-  "minecraft:item_ber": null,
-  "minecraft:villager_profession": null,
-  "minecraft:item_tooltip": null,
-  "minecraft:falling_block": null,
-  "minecraft:entity_health": null,
-  "minecraft:entity_armor": null,
-  "minecraft:crop_progress": null,
-  "minecraft:mob_spawner": null,
-  "minecraft:item_display": null,
-  "minecraft:block_display": null,
-  "minecraft:item_storage": null,
-  "minecraft:fluid_storage": null,
-  "minecraft:energy_storage": null,
-  "minecraft:progress": null,
+  "create:hide_boiler_tanks": null,
+  "create:placard": null,
+  "jade:block_face": null,
+  "jade:distance": null,
+  "jade:mod_name": null,
  "jade:object_name": null,
  "jade:registry_name": null,
-  "jade:mod_name": null,
-  "jade:distance": null,
-  "jade:block_face": null
+  "lootr:info": null,
+  "lootr:inventory": 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:waxed": null,
+  "minecraft:zombie_villager": null,
+  "tombstone:graves": null,
+  "touhou_little_maid:altar": null,
+  "touhou_little_maid:maid": null,
+  "touhou_little_maid:picnic_mat": null,
+  "touhou_little_maid:shrine_lamp": null,
+  "touhou_little_maid:tombstone": null,
+  "twilightforest:quest_ram_wool": null,
+  "waystones:waystone": null
 }
--- a/.minecraft/versions/边境流放/config/lootr-client.toml
+++ b/.minecraft/versions/边境流放/config/lootr-client.toml
@@ -1,3 +1,5 @@
 #set to true to use vanilla textures instead of Lootr special textures. Note: this will prevent previously opened chests from rendering differently
 vanilla_textures = false
+#set to true to use the old Lootr textures
+old_textures = false

--- a/.minecraft/versions/边境流放/config/lootr-common.toml
+++ b/.minecraft/versions/边境流放/config/lootr-common.toml
@@ -1,5 +1,3 @@
-#skip unloaded block entities that are eligible for conversion, set to false to potentially resolve issues with containers that aren't being converted [default: true]
-skip_unloaded = true
 #whether or not the entire forge:chests/wooden tag should be added to the conversion list for structures (if they are backed by RandomizableContainerBlockEntity)
 convert_wooden_chests = true
 #list of loot tables which will decay (default blank, meaning no chests decay, in the format of (in the format of ["modid:loot_table", "othermodid:other_loot_table"])
@@ -8,8 +6,6 @@ decay_loot_tables = []
 additional_chests = []
 #list of mod IDs whose loot tables will decay (default blank, meaning no chests decay, in the format ["modid", "othermodid"])
 decay_modids = []
-#list of structures in which contains shouldn't be converted (in the format of ["modid:structure_name", "othermodid:other_structure_name"])
-loot_structure_blacklist = []
 #list of modids whose loot tables shouldn't be converted (in the format of ["modid", "other_modid"])
 loot_modid_blacklist = []
 #allows fake players to destroy Lootr chests without having to sneak, overrides the `disable_break` option for fake players
@@ -36,8 +32,6 @@ refresh_dimensions = []
 refresh_modids = []
 #determine whether or not loot generated is the same for all players using the provided seed, or randomised per player
 randomise_seed = true
-#whether or not quark chests used in world generation for loot purposes should be replaced with Lootr chests
-convert_quark = true
 #how long (in ticks) a decaying loot containers should take to decay (default 5 minutes = 5 * 60 * 20)
 #Range: > 0
 decay_value = 6000
@@ -71,9 +65,9 @@ refresh_value = 24000
 check_world_border = false
 #list of structures in which loot chests should automatically refresh (in the format of ["modid:structure_name", "othermodid:other_structure_name"])
 refresh_structures = []
-#the maximum age for containers; entries above this age will be discarded [default: 180 * 20, 3 minutes]
+#the maximum age for containers; entries above this age will be discarded [default: 60 * 20 * 15, fifteen minutes] [note: the value 6000 will be corrected to 18000. if you wish to use 6000, please use 6001 or 5999.]
 #Range: > 0
-max_age = 6000
+max_age = 18000
 #if true, no chests will be converted
 disable = false
 #list of dimensions by modid that loot chests should not be replaced in (default: blank, allowing all modids, format e.g., ["minecraft
@@ -84,4 +78,8 @@ modid_dimension_blacklist = []
 modid_dimension_whitelist = []
 #when true, custom inventories will act like trapped chests when opened
 trapped_custom = false
+#whether or not the Elytra item frame should be converted into a standard loot chest with a guaranteed elytra
+convert_elytras = true
+#disables styling of breaking, decaying and refreshing messages sent to players
+disable_message_styles = false

--- a/.minecraft/versions/边境流放/config/mca.json
+++ b/.minecraft/versions/边境流放/config/mca.json
@@ -73,6 +73,12 @@
  "villagerChatAIEndpoint": "https://api.conczin.net/v1/mca/chat",
  "villagerChatAIToken": "",
  "villagerChatAIModel": "mistral-small",
+  "villagerChatAISystemPrompt": "",
+  "villagerChatAIUseLongTermMemory": false,
+  "villagerChatAIUseSharedLongTermMemory": false,
+  "villagerChatAIIncludeSessionInformation": false,
+  "inworldAIToken": "",
+  "inworldAIResourceNames": {},
  "enableOnlineTTS": false,
  "villagerTTSServer": "http://api.rk.conczin.net/",
  "guardSpawnFraction": 0.175,
--- a/.minecraft/versions/边境流放/config/mine_and_slash-client.toml
+++ b/.minecraft/versions/边境流放/config/mine_and_slash-client.toml
@@ -0,0 +1,120 @@
+
+#Client Configs
+[general]
+	show_low_mana_warning = true
+	render_mob_bar = true
+	render_death_stats = true
+	render_item_rarity_background = true
+	show_durability = true
+	render_mob_hp_gui = true
+	only_render_mob_looked_at = true
+	render_floating_damage = true
+	MODIFY_TOOLTIP_LENGTH = true
+	IN_DEPTH_TOOLTIPS_BY_DEFAULT = true
+	#Range: 0.0 ~ 1.0
+	ITEM_RARITY_OPACITY = 0.75
+	#Range: 0.0 ~ 10.0
+	health_bar_gui_scale = 1.25
+	#When OFF: 8 bars, 8 keybinds. When ON: 4 bars, 5 keybinds(4 for each bar, 1 for hotbar swap button)
+	HOTBAR_SWAPPING = false
+	#Allowed Values: NONE, BOTTOM_CENTER, OVER_VANILLA, TOP_LEFT
+	GUI_POSITION = "TOP_LEFT"
+	#Allowed Values: BORDER, FULL
+	ITEM_RARITY_BACKGROUND_TYPE = "FULL"
+	#Allowed Values: RPG, NONE
+	PLAYER_GUI_TYPE = "RPG"
+	#Range: 1.0E-6 ~ 1.0
+	SKILL_TREE_ZOOM_SPEED = 0.15
+	#Range: 0 ~ 1000
+	REMOVE_EMPTY_TOOLTIP_LINES_IF_MORE_THAN_X_LINES = 35
+	#Range: 0.10000000149011612 ~ 1.0
+	SPELL_PARTICLE_MULTI = 1.0
+	#Range: 0.0 ~ 5000.0
+	DONT_CULL_PARTICLES_UNDER = 50.0
+	#Use player animations when casting mns spells. Disable in case of other animation mod incompatibility
+	USE_SPELL_ANIMATIONS = true
+	#Allowed Values: DEFAULT, IN_A_ROW
+	DAMAGE_PARTICLE_STYLE = "DEFAULT"
+
+	#Overlays
+	[general.overlays]
+		#Allowed Values: HORIZONTAL, VERTICAL
+		STATUS_EFFECTS_OVERLAY_TYPE = "HORIZONTAL"
+		#Allowed Values: HORIZONTAL, VERTICAL
+		SPELL_HOTBAR_OVERLAY_TYPE = "VERTICAL"
+		#Allowed Values: DISABLE_OVERLAY, SPELL_CAST_BAR, HOTBAR_HORIZONTAL, HOTBAR_VERTICAL, EFFECTS_UNDER_VERTICAL_HOTBAR, EFFECTS_BOTTOM_RIGHT
+		SPELL_HOTBAR_HORIZONTAL_CONFIG = "HOTBAR_HORIZONTAL"
+		#Allowed Values: DISABLE_OVERLAY, SPELL_CAST_BAR, HOTBAR_HORIZONTAL, HOTBAR_VERTICAL, EFFECTS_UNDER_VERTICAL_HOTBAR, EFFECTS_BOTTOM_RIGHT
+		SPELL_HOTBAR_VERTICAL_CONFIG = "HOTBAR_VERTICAL"
+		#Allowed Values: DISABLE_OVERLAY, SPELL_CAST_BAR, HOTBAR_HORIZONTAL, HOTBAR_VERTICAL, EFFECTS_UNDER_VERTICAL_HOTBAR, EFFECTS_BOTTOM_RIGHT
+		EFFECTS_VERTICAL_CONFIG = "EFFECTS_UNDER_VERTICAL_HOTBAR"
+		#Allowed Values: DISABLE_OVERLAY, SPELL_CAST_BAR, HOTBAR_HORIZONTAL, HOTBAR_VERTICAL, EFFECTS_UNDER_VERTICAL_HOTBAR, EFFECTS_BOTTOM_RIGHT
+		EFFECTS_HORIZONTAL_CONFIG = "EFFECTS_BOTTOM_RIGHT"
+		#Allowed Values: DISABLE_OVERLAY, SPELL_CAST_BAR, HOTBAR_HORIZONTAL, HOTBAR_VERTICAL, EFFECTS_UNDER_VERTICAL_HOTBAR, EFFECTS_BOTTOM_RIGHT
+		SPELL_CAST_BAR_CONFIG = "SPELL_CAST_BAR"
+
+		#Spell Cast Bar Overlay Preset
+		[general.overlays.spell_cast_bar]
+			#Allowed Values: SCREEN, SPELL_HOTBAR_HORIZONTAL, SPELL_HOTBAR_VERTICAL, EFFECTS_VERTICAL, EFFECTS_HORIZONTAL, SPELL_CAST_BAR
+			ANCHOR_TO = "SCREEN"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_X = "MIDDLE"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_Y = "END"
+			#Range: -50000 ~ 50000
+			X_OFFSET = -86
+			#Range: -50000 ~ 50000
+			Y_OFFSET = -125
+
+		#Horizontal Spell Hotbar Overlay Preset
+		[general.overlays.horizontal_spell_hotbar]
+			#Allowed Values: SCREEN, SPELL_HOTBAR_HORIZONTAL, SPELL_HOTBAR_VERTICAL, EFFECTS_VERTICAL, EFFECTS_HORIZONTAL, SPELL_CAST_BAR
+			ANCHOR_TO = "SCREEN"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_X = "MIDDLE"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_Y = "END"
+			#Range: -50000 ~ 50000
+			X_OFFSET = -81
+			#Range: -50000 ~ 50000
+			Y_OFFSET = -65
+
+		#Vertical Spell Hotbar Overlay Preset
+		[general.overlays.vertical_spell_hotbar]
+			#Allowed Values: SCREEN, SPELL_HOTBAR_HORIZONTAL, SPELL_HOTBAR_VERTICAL, EFFECTS_VERTICAL, EFFECTS_HORIZONTAL, SPELL_CAST_BAR
+			ANCHOR_TO = "SCREEN"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_X = "START"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_Y = "MIDDLE"
+			#Range: -50000 ~ 50000
+			X_OFFSET = 0
+			#Range: -50000 ~ 50000
+			Y_OFFSET = -81
+
+		#Status Effects Bottom Right Overlay Preset
+		[general.overlays.status_effects_bottom_right]
+			#Allowed Values: SCREEN, SPELL_HOTBAR_HORIZONTAL, SPELL_HOTBAR_VERTICAL, EFFECTS_VERTICAL, EFFECTS_HORIZONTAL, SPELL_CAST_BAR
+			ANCHOR_TO = "SCREEN"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_X = "MIDDLE"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_Y = "END"
+			#Range: -50000 ~ 50000
+			X_OFFSET = 90
+			#Range: -50000 ~ 50000
+			Y_OFFSET = -30
+
+		#Status Effects Under Vertical Hotbar Overlay Preset
+		[general.overlays.status_effects_under_vertical_hotbar]
+			#Allowed Values: SCREEN, SPELL_HOTBAR_HORIZONTAL, SPELL_HOTBAR_VERTICAL, EFFECTS_VERTICAL, EFFECTS_HORIZONTAL, SPELL_CAST_BAR
+			ANCHOR_TO = "SPELL_HOTBAR_VERTICAL"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_X = "START"
+			#Allowed Values: START, END, MIDDLE
+			ANCHOR_Y = "END"
+			#Range: -50000 ~ 50000
+			X_OFFSET = 2
+			#Range: -50000 ~ 50000
+			Y_OFFSET = 2
+
--- a/.minecraft/versions/边境流放/config/mine_and_slash_neat_gui-client.toml
+++ b/.minecraft/versions/边境流放/config/mine_and_slash_neat_gui-client.toml
@@ -0,0 +1,27 @@
+
+[general]
+	"Max Distance" = 12
+	"Render with Interface Disabled (F1)" = false
+	"Height Above Mob" = 0.6
+	"Draw Background" = true
+	"Background Padding" = 2
+	"Background Height" = 6
+	"Health Bar Height" = 4
+	"Plate Size" = 25
+	"Plate Size (Boss)" = 50
+	"Show Attributes" = true
+	"Show Armor" = true
+	"Group Armor (condense 5 iron icons into 1 diamond icon)" = true
+	"Color Health Bar by Type (instead of health percentage)" = false
+	"HP Text Height" = 14
+	"Show Max HP" = true
+	"Show Current HP" = true
+	"Show HP Percentage" = true
+	"Display on Players" = true
+	"Display on Bosses" = true
+	"Only show the health bar for the entity looked at" = false
+	"Show entities with full health" = true
+	"Show Debug Info with F3" = true
+	#Blacklist uses entity IDs, not their display names. Use F3 to see them in the Neat bar.
+	Blacklist = ["minecraft:shulker", "minecraft:armor_stand", "minecraft:cod", "minecraft:salmon", "minecraft:pufferfish", "minecraft:tropical_fish"]
+
--- a/.minecraft/versions/边境流放/config/modernfix-common.toml
+++ b/.minecraft/versions/边境流放/config/modernfix-common.toml
@@ -0,0 +1,3 @@
+#These JEI plugins will be loaded on the main thread
+blacklist_async_jei_plugins = ["jepb:jei_plugin"]
+
--- a/.minecraft/versions/边境流放/config/modernfix-mixins.properties
+++ b/.minecraft/versions/边境流放/config/modernfix-mixins.properties
@@ -0,0 +1,97 @@
+# This is the configuration file for ModernFix.
+# In general, prefer using the config screen to editing this file. It can be accessed
+# via the standard mod menu on your respective mod loader. Changes will, however,
+# require restarting the game to take effect.
+#
+# The following options can be enabled or disabled if there is a compatibility issue.
+# Add a line with your option name and =true or =false at the bottom of the file to enable
+# or disable a rule. For example:
+#   mixin.perf.dynamic_resources=true
+# Do not include the #. You may reset to defaults by deleting this file.
+#
+# Available options:
+#  mixin.bugfix.buffer_builder_leak=true # (default)
+#  mixin.bugfix.chunk_deadlock=true # (default)
+#  mixin.bugfix.cofh_core_crash=true # (default)
+#  mixin.bugfix.concurrency=true # (default)
+#  mixin.bugfix.ctm_resourceutil_cme=true # (default)
+#  mixin.bugfix.ender_dragon_leak=true # (default)
+#  mixin.bugfix.entity_pose_stack=true # (default)
+#  mixin.bugfix.extra_experimental_screen=true # (default)
+#  mixin.bugfix.fix_config_crashes=true # (default)
+#  mixin.bugfix.forge_at_inject_error=true # (default)
+#  mixin.bugfix.forge_vehicle_packets=true # (default)
+#  mixin.bugfix.model_data_manager_cme=true # (default)
+#  mixin.bugfix.packet_leak=false # (default)
+#  mixin.bugfix.paper_chunk_patches=true # (default)
+#  mixin.bugfix.recipe_book_type_desync=true # (default)
+#  mixin.bugfix.removed_dimensions=true # (default)
+#  mixin.bugfix.restore_old_dragon_movement=false # (default)
+#  mixin.bugfix.unsafe_modded_shape_caches=true # (default)
+#  mixin.bugfix.world_leaks=true # (default)
+#  mixin.bugfix.world_screen_skipped=true # (default)
+#  mixin.devenv=false # (default)
+#  mixin.feature.branding=true # (default)
+#  mixin.feature.cause_lag_by_disabling_threads=false # (default)
+#  mixin.feature.direct_stack_trace=false # (default)
+#  mixin.feature.disable_unihex_font=false # (default)
+#  mixin.feature.integrated_server_watchdog=true # (default)
+#  mixin.feature.measure_time=true # (default)
+#  mixin.feature.registry_event_progress=false # (default)
+#  mixin.feature.remove_chat_signing=false # (default)
+#  mixin.feature.snapshot_easter_egg=true # (default)
+#  mixin.feature.spam_thread_dump=false # (default)
+#  mixin.feature.spark_profile_launch=false # (default)
+#  mixin.feature.stalled_chunk_load_detection=false # (default)
+#  mixin.feature.warn_missing_perf_mods=true # (default)
+#  mixin.launch.class_search_cache=true # (default)
+#  mixin.perf.blast_search_trees=true # (default)
+#  mixin.perf.blast_search_trees.force=false # (default)
+#  mixin.perf.cache_blockstate_cache_arrays=true # (default)
+#  mixin.perf.cache_model_materials=true # (default)
+#  mixin.perf.cache_profile_texture_url=true # (default)
+#  mixin.perf.cache_strongholds=true # (default)
+#  mixin.perf.cache_upgraded_structures=true # (default)
+#  mixin.perf.chunk_meshing=true # (default)
+#  mixin.perf.clear_mixin_classinfo=false # (default)
+#  mixin.perf.compact_bit_storage=true # (default)
+#  mixin.perf.datapack_reload_exceptions=true # (default)
+#  mixin.perf.dedicated_reload_executor=true # (default)
+#  mixin.perf.deduplicate_climate_parameters=false # (default)
+#  mixin.perf.deduplicate_location=false # (default)
+#  mixin.perf.deduplicate_wall_shapes=true # (default)
+#  mixin.perf.dynamic_dfu=true # (default)
+#  mixin.perf.dynamic_entity_renderers=false # (default)
+#  mixin.perf.dynamic_resources=false # (default)
+#  mixin.perf.dynamic_resources.ctm=true # (default)
+#  mixin.perf.dynamic_resources.rs=true # (default)
+#  mixin.perf.dynamic_resources.supermartijncore=true # (default)
+#  mixin.perf.dynamic_sounds=true # (default)
+#  mixin.perf.dynamic_structure_manager=true # (default)
+#  mixin.perf.fast_forge_dummies=true # (default)
+#  mixin.perf.fast_registry_validation=true # (default)
+#  mixin.perf.faster_item_rendering=false # (default)
+#  mixin.perf.faster_structure_location=true # (default)
+#  mixin.perf.faster_texture_stitching=true # (default)
+#  mixin.perf.fix_loop_spin_waiting=true # (default)
+#  mixin.perf.forge_cap_retrieval=true # (default)
+#  mixin.perf.forge_registry_alloc=true # (default)
+#  mixin.perf.forge_registry_lambda=true # (default)
+#  mixin.perf.kubejs=true # (default)
+#  mixin.perf.model_optimizations=true # (default)
+#  mixin.perf.mojang_registry_size=true # (default)
+#  mixin.perf.nbt_memory_usage=true # (default)
+#  mixin.perf.patchouli_deduplicate_books=true # (default)
+#  mixin.perf.potential_spawns_alloc=true # (default)
+#  mixin.perf.reduce_blockstate_cache_rebuilds=true # (default)
+#  mixin.perf.remove_biome_temperature_cache=true # (default)
+#  mixin.perf.remove_spawn_chunks=false # (default)
+#  mixin.perf.resourcepacks=true # (default)
+#  mixin.perf.state_definition_construct=true # (default)
+#  mixin.perf.tag_id_caching=true # (default)
+#  mixin.perf.thread_priorities=true # (default)
+#  mixin.perf.ticking_chunk_alloc=true # (default)
+#  mixin.perf.worldgen_allocation=false # (default)
+#  mixin.safety=true # (default)
+#
+# User overrides go here.
--- a/.minecraft/versions/边境流放/config/oculus.properties
+++ b/.minecraft/versions/边境流放/config/oculus.properties
@@ -1,5 +1,5 @@
 #This file stores configuration options for Iris, such as the currently active shaderpack
-#Tue Mar 12 16:11:43 CST 2024
+#Tue Dec 10 05:42:26 CST 2024
 colorSpace=SRGB
 disableUpdateMessage=false
 enableDebugOptions=false
--- a/.minecraft/versions/边境流放/config/playerrevive.json
+++ b/.minecraft/versions/边境流放/config/playerrevive.json
@@ -24,7 +24,10 @@
    "hasShaderEffect": true,
    "changePermissionLevel": false,
    "permissionLevel": 0,
-    "canBePushed": true
+    "canBePushed": true,
+    "disableInventoryAccess": false,
+    "disableChatAccess": false,
+    "disableServerCommands": false
  },
  "revive": {
    "requiredReviveProgress": 100.0,
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/collapsible.json5
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/collapsible.json5
@@ -0,0 +1,4 @@
+{
+	"disabledGroups": [],
+	"customGroups": []
+}
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/config.json5
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/config.json5
@@ -1,17 +1,13 @@
 {
 	"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\"}",
-			"{data:{Count:1b,id:\"minecraft:cobblestone_wall\",type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}",
-			"{data:{Count:1b,id:\"minecraft:tipped_arrow\",tag:{Potion:\"minecraft:turtle_master\"},type:\"minecraft:item\"},type:\"roughlyenoughitems:entry_stack\"}"
-		],
+		"favorites": [],
 		"hiddenFavorites": [],
 		"displayHistory": [],
-		// Declares whether cheating mode is on.
 		"cheating": false,
 		"favoritesEnabled": true,
+		"reduceMotion": false,
 		"keyBindings": {
+			"useNativeKeybinds": false,
 			"recipeKeybind": {
 				"keyCode": "key.keyboard.r",
 				"modifier": 0
@@ -55,23 +51,52 @@
 		},
 		// Declares whether REI is visible.
 		"overlayVisible": true,
-		"cheatingStyle": "GRAB",
-		"motion": {
-			"favoritesAnimation": true
-		}
+		"cheatingStyle": "GRAB"
+	},
+	"appearance": {
+		"recipeScreenType": "ORIGINAL",
+		// Declares the appearance of REI windows.
+		"theme": "LIGHT",
+		"layout": {
+			// Declares the position of the search field.
+			"searchFieldLocation": "BOTTOM_SIDE",
+			// Declares the position of the config button.
+			"configButtonLocation": "LOWER",
+			// Declares whether the craftable filter button is enabled.
+			"showCraftableOnlyButton": true
+		},
+		// Declares the appearance of recipe's border.
+		"recipeBorder": "DEFAULT",
+		// Declares whether entry panel is scrolled.
+		"scrollingEntryListWidget": false,
+		// Declares whether entry panel should be invisible when not searching
+		"hideEntryPanelIfIdle": false,
+		"rainbow": false,
+		"horizontalEntriesBoundaries": 1.0,
+		"verticalEntriesBoundaries": 1.0,
+		"horizontalEntriesBoundariesColumns": 5,
+		"verticalEntriesBoundariesRows": 1000,
+		"horizontalEntriesBoundariesAlignment": 1.0,
+		"verticalEntriesBoundariesAlignment": 0.5,
+		"favoritesHorizontalEntriesBoundaries": 1.0,
+		"favoritesHorizontalEntriesBoundariesColumns": 50,
+		"syntaxHighlightingMode": "COLORFUL",
+		"isFocusModeZoomed": false
+	},
+	"functionality": {
+		"inputMethod": "rei:pinyin",
+		// Declares whether REI should remove the recipe book.
+		"disableRecipeBook": false,
+		// Declares whether mob effects should be on the left side instead of the right side.
+		"leftSideMobEffects": true,
+		// Declares whether subsets is enabled.
+		"isSubsetsEnabled": false,
+		"allowInventoryHighlighting": true,
+		"inventoryHighlightingDarkenOpacity": 0.85,
+		"inventoryHighlightingOpacity": 1.0,
+		"itemCheatingMode": "REI_LIKE"
 	},
 	"advanced": {
-		"filtering": {
-			"shouldFilterDisplays": true,
-			"filteringRules": [
-				"{id:\"roughlyenoughitems:manual\",rule:{}}",
-				"{id:\"roughlyenoughitems:basic\",rule:{}}",
-				"{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}"
-			],
-			"filteringQuickCraftCategories": { },
-			"filteredStacks": []
-		},
-		"enableJeiCompatibilityLayer": true,
 		"tooltips": {
 			// Declares whether REI should append mod names to entries.
 			"appendModNames": true,
@@ -133,43 +158,20 @@
 			"registerRecipesInAnotherThread": true,
 			"newFastEntryRendering": true,
 			"cachingFastEntryRendering": false,
-			"cachingDisplayLookup": true
-		}
-	},
-	"appearance": {
-		"recipeScreenType": "ORIGINAL",
-		// Declares the appearance of REI windows.
-		"theme": "LIGHT",
-		"layout": {
-			// Declares the position of the search field.
-			"searchFieldLocation": "BOTTOM_SIDE",
-			// Declares the position of the config button.
-			"configButtonLocation": "LOWER",
-			// Declares whether the craftable filter button is enabled.
-			"showCraftableOnlyButton": true
+			"cachingDisplayLookup": true,
+			"categorySettings": {
+				"filteringQuickCraftCategories": { },
+				"categoryOrdering": [],
+				"hiddenCategories": []
+			}
 		},
-		// Declares the appearance of recipe's border.
-		"recipeBorder": "DEFAULT",
-		// Declares whether entry panel is scrolled.
-		"scrollingEntryListWidget": false,
-		"horizontalEntriesBoundaries": 1.0,
-		"verticalEntriesBoundaries": 1.0,
-		"horizontalEntriesBoundariesColumns": 5,
-		"verticalEntriesBoundariesRows": 1000,
-		"favoritesHorizontalEntriesBoundaries": 1.0,
-		"favoritesHorizontalEntriesBoundariesColumns": 50,
-		"syntaxHighlightingMode": "COLORFUL",
-		"isFocusModeZoomed": false
-	},
-	"functionality": {
-		"inputMethod": "rei:pinyin",
-		// Declares whether REI should remove the recipe book.
-		"disableRecipeBook": false,
-		// Declares whether mob effects should be on the left side instead of the right side.
-		"leftSideMobEffects": true,
-		// Declares whether subsets is enabled.
-		"isSubsetsEnabled": false,
-		"allowInventoryHighlighting": true,
-		"itemCheatingMode": "REI_LIKE"
+		"filtering": {
+			"filteredStacks": [],
+			"shouldFilterDisplays": true,
+			"filteringRules": [
+				"{id:\"roughlyenoughitems:manual\",rule:{}}",
+				"{id:\"roughlyenoughitems:basic\",rule:{}}"
+			]
+		}
 	}
 }
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/favorites.json5
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/favorites.json5
@@ -0,0 +1,5 @@
+{
+	"favorites": [],
+	"hiddenFavorites": [],
+	"displays": []
+}
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/hints.json
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/hints.json
@@ -1 +1 @@
-{"UUID":"0000000000003007998FFD40182613AF","shownHints":[]}
+{"UUID":"e3d46296b34438efbd1b8215a0721441","shownHints":[]}
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/pinyin.properties
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/pinyin.properties
@@ -1,2 +1,2 @@
 #Pinyin Options
-#Tue Mar 12 16:13:21 CST 2024
+#Mon Dec 09 16:12:52 CST 2024
--- a/.minecraft/versions/边境流放/config/roughlyenoughitems/pinyin_double.properties
+++ b/.minecraft/versions/边境流放/config/roughlyenoughitems/pinyin_double.properties
@@ -1,3 +1,3 @@
 #Double Pinyin Options
-#Tue Mar 12 16:13:21 CST 2024
+#Mon Dec 09 16:12:52 CST 2024
 Converter=sougou
--- a/.minecraft/versions/边境流放/config/soulbound-common.toml
+++ b/.minecraft/versions/边境流放/config/soulbound-common.toml
@@ -37,4 +37,10 @@ whitelist = []
 #Blacklist
 #黑名单
 blacklist = []
+#Whether to allow librarians to sell this enchantment
+#是否允许图书管理员出售此附魔
+allowEnchantedBookTrade = true
+#Whether to disable obtaining in survival
+#是否禁用生存模式获取途径
+disableSurvivalObtaining = false

--- a/.minecraft/versions/边境流放/config/spawnermod.json
+++ b/.minecraft/versions/边境流放/config/spawnermod.json
@@ -54,27 +54,36 @@
    "alexsmobs:spawn_egg_wa": 1,
    "cataclysm:amethyst_crab": 0,
    "cataclysm:ancient_remnant": 0,
+    "cataclysm:aptrgangr": 0,
+    "cataclysm:coral_golem": 0,
    "cataclysm:coralssus": 1,
    "cataclysm:deepling": 1,
    "cataclysm:deepling_angler": 1,
    "cataclysm:deepling_brute": 1,
    "cataclysm:deepling_priest": 1,
    "cataclysm:deepling_warlock": 0,
+    "cataclysm:draugr": 0,
+    "cataclysm:elite_draugr": 0,
    "cataclysm:ender_golem": 1,
    "cataclysm:ender_guardian": 1,
    "cataclysm:endermaptera": 1,
    "cataclysm:ignis": 1,
+    "cataclysm:ignited_berserker": 0,
    "cataclysm:ignited_revenant": 1,
+    "cataclysm:kobolediator": 0,
    "cataclysm:koboleton": 0,
    "cataclysm:lionfish": 1,
+    "cataclysm:maledictus": 0,
    "cataclysm:modern_remnant": 0,
    "cataclysm:nameless_sorcerer": 1,
    "cataclysm:netherite_monstrosity": 1,
+    "cataclysm:royal_draugr": 0,
    "cataclysm:the_baby_leviathan": 1,
    "cataclysm:the_harbinger": 1,
    "cataclysm:the_leviathan": 1,
    "cataclysm:the_prowler": 0,
    "cataclysm:the_watcher": 0,
+    "cataclysm:wadjet": 0,
    "creeperoverhaul:badlands_creeper": 1,
    "creeperoverhaul:bamboo_creeper": 1,
    "creeperoverhaul:beach_creeper": 1,
--- a/.minecraft/versions/边境流放/config/touhou_little_maid-common.toml
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid-common.toml
@@ -37,6 +37,33 @@
 	MaidBackpackBlackList = []
 	#The entity that the maid will not recognize as targets for attack
 	MaidAttackIgnore = []
+	#These items cannot be used as a maid's work meals
+	MaidWorkMealsBlockList = ["minecraft:pufferfish", "minecraft:poisonous_potato", "minecraft:rotten_flesh", "minecraft:spider_eye", "minecraft:chorus_fruit"]
+	#These items cannot be used as a maid's home meals
+	MaidHomeMealsBlockList = ["minecraft:pufferfish", "minecraft:poisonous_potato", "minecraft:rotten_flesh", "minecraft:spider_eye", "minecraft:chorus_fruit"]
+	#These items cannot be used as a maid's heal meals
+	MaidHealMealsBlockList = ["minecraft:pufferfish", "minecraft:poisonous_potato", "minecraft:rotten_flesh", "minecraft:spider_eye"]
+	#These items cannot be used as a maid's work meals which match the regex
+	MaidWorkMealsBlockListRegEx = []
+	#These items cannot be used as a maid's home meals which match the regex
+	MaidHomeMealsBlockListRegEx = []
+	#These items cannot be used as a maid's heal meals which match the regex
+	MaidHealMealsBlockListRegEx = []
+	#Percentage chance of replace Allays spawn in pillager outposts with Maids
+	#Range: 0.0 ~ 1.0
+	ReplaceAllayPercent = 0.2
+	#These entries configure the container returned after a maid has eaten
+	#Eg: ["minecraft:beetroot_soup", "minecraft:bowl"]
+	MaidEatenReturnContainerList = []
+	#Recognition distance of a maid under the gun task, Suitable for sniper rifles
+	#Range: 0 ~ 512
+	MaidGunLongDistance = 64
+	#Recognition distance of a maid under the gun task, Suitable for most types
+	#Range: 0 ~ 512
+	MaidGunMediumDistance = 48
+	#Recognition distance of a maid under the gun task, Suitable for pistols and shotguns
+	#Range: 0 ~ 512
+	MaidGunNearDistance = 32

 [chair]
 	#Chair can switch models freely
@@ -69,8 +96,15 @@
 	MaidFairyBlacklistDimension = ["minecraft:the_nether", "minecraft:the_end", "twilightforest:twilight_forest"]
 	#Give the Memorizable Gensokyo book item for player first join
 	GivePatchouliBook = true
-	#The following biome do not spawn maid fairy
-	MaidFairyBlacklistBiome = ["minecraft:the_void", "minecraft:mushroom_fields"]
+	#Whether to turn off the Optifine warning
+	CloseOptifineWarning = false
+	#The range of the scarecrow to prevent the fairy maid from spawning
+	#Range: > 0
+	ScarecrowRange = 48
+	#Whether to use the new version of the Fairy Maid model
+	UseNewMaidFairyModel = true
+	#Whether to enable model icon caching
+	ModelIconCache = true

 [vanilla]
 	#Whether to replace the vanilla slime model with the yukkuri.
--- a/.minecraft/versions/边境流放/config/touhou_little_maid/info.json
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid/info.json
--- a/.minecraft/versions/边境流放/config/twilightforest-common.toml
+++ b/.minecraft/versions/边境流放/config/twilightforest-common.toml
@@ -70,12 +70,12 @@ cloudBlockPrecipitationDistance = 32
 	enableShapelessCrafting = false
 	#Disables the uncrafting function of the uncrafting table. Recommended as a last resort if there's too many things to change about its behavior (or you're just lazy, I dont judge).
 	#Do note that special uncrafting recipes are not disabled as the mod relies on them for other things.
-	disableUncrafting = false
+	disableUncrafting = true
 	#Disables any usage of the uncrafting table, as well as prevents it from showing up in loot or crafted.
 	#Please note that table has more uses than just uncrafting, you can read about them here! http://benimatic.com/tfwiki/index.php?title=Uncrafting_Table
 	#It is highly recommended to keep the table enabled as the mod has special uncrafting exclusive recipes, but the option remains for people that dont want the table to be functional at all.
 	#If you are looking to just prevent normal crafting recipes from being reversed, consider using the 'disableUncrafting' option instead.
-	disableUncraftingTable = false
+	disableUncraftingTable = true

 #Settings for all things related to the magic trees.
 ["Magic Trees"]
--- a/.minecraft/versions/边境流放/config/xaerominimap-common.txt
+++ b/.minecraft/versions/边境流放/config/xaerominimap-common.txt
@@ -2,3 +2,4 @@ allowCaveModeOnServer:true
 allowNetherCaveModeOnServer:true
 allowRadarOnServer:true
 registerStatusEffects:true
+everyoneTracksEveryone:false
--- a/.minecraft/versions/边境流放/config/xaerominimap.txt
+++ b/.minecraft/versions/边境流放/config/xaerominimap.txt
@@ -54,6 +54,7 @@ waypointOpacityMap:90
 hideWorldNames:1
 openSlimeSettings:true
 alwaysShowDistance:false
+renderLayerIndex:1
 crossDimensionalTp:true
 biomeColorsVanillaMode:false
 lookingAtAngle:10
@@ -104,8 +105,12 @@ infoDisplayBackgroundOpacity:40
 caveModeToggleTimer:1000
 legibleCaveMaps:false
 biomeBlending:true
-displayTrackedPlayers:true
+displayTrackedPlayersOnMap:true
+displayTrackedPlayersInWorld:true
 dimensionScaledMaxWaypointDistance:true
+trackedPlayerWorldIconScale:0
+trackedPlayerWorldNameScale:0
+trackedPlayerMinimapIconScale:0
 displayClaims:true
 displayCurrentClaim:true
 claimsFillOpacity:46
@@ -125,9 +130,4 @@ infoDisplay:highlights:true:15:-1
 infoDisplay:light_overlay_indicator:true:15:-1
 infoDisplay:manual_cave_mode_indicator:true:15:-1
 infoDisplay:custom_sub_world:true:15:-1
-interface:dummy:0:36:true:false:false:false
-interface:dummy:0:10000:true:false:false:false
-interface:dummy:0:0:false:false:true:false
-interface:dummy:0:36:true:false:false:false
-interface:gui.xaero_minimap:0:0:false:false:true:false
-#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints
+module;id=xaerominimap:minimap;active=true;x=0;y=0;centered=false;fromRight=true;fromBottom=false;flippedVer=false;flippedHor=false;fromOldSystem=true;
--- a/.minecraft/versions/边境流放/config/xaerominimap_entities.json
+++ b/.minecraft/versions/边境流放/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,
@@ -22,8 +22,8 @@
    "dotSize": 2.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 2.0,
-    "heightLimit": 20.0,
    "names": 0.0,
+    "heightLimit": 20.0,
    "iconScale": 1.0
  },
  "subCategories": [
--- a/.minecraft/versions/边境流放/config/xaeroworldmap-common.txt
+++ b/.minecraft/versions/边境流放/config/xaeroworldmap-common.txt
@@ -1,3 +1,4 @@
 allowCaveModeOnServer:true
 allowNetherCaveModeOnServer:true
 registerStatusEffects:true
+everyoneTracksEveryone:false