0.0.11-alpha

0.0.10-alpha
2024-12-22 20:40:49 +08:00 · 2024-12-18 21:20:10 +08:00
51 changed files with 3153 additions and 456 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .minecraft/versions/边境流放/crash-reports/*
 .minecraft/versions/边境流放/CustomSkinLoader/*
 .minecraft/versions/边境流放/logs/*
+.minecraft/versions/边境流放/modernfix/*
 .minecraft/versions/边境流放/natives-windows-x86_64/*
 .minecraft/versions/边境流放/saves/*
 .minecraft/versions/边境流放/screenshots/*
@@ -19,4 +20,4 @@
 .minecraft/versions/边境流放/边境流放-natives/*
 hmcl.json
 PCL/LatestLaunch.bat
-PCL/Log*
+PCL/Log*
--- a/.minecraft/versions/边境流放/config/InventoryHUD/curios.json
+++ b/.minecraft/versions/边境流放/config/InventoryHUD/curios.json
@@ -0,0 +1 @@
+{"ring_2":{"x":151,"y":93,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"feet":{"x":31,"y":19,"enabled":false,"halign":"LEFT","valign":"TOP"},"wallet":{"x":195,"y":110,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"hands":{"x":195,"y":93,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"belt":{"x":195,"y":59,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"ring":{"x":151,"y":76,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"back":{"x":151,"y":110,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"bracelet":{"x":0,"y":85,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"necklace":{"x":151,"y":59,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"body":{"x":0,"y":68,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":0,"y":51,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"head":{"x":195,"y":42,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"omen":{"x":151,"y":42,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"charm":{"x":1,"y":54,"enabled":true,"halign":"MIDDLE","valign":"BOTTOM"},"hands_2":{"x":195,"y":76,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"}}
--- a/.minecraft/versions/边境流放/config/bettercombat/client.json5
+++ b/.minecraft/versions/边境流放/config/bettercombat/client.json5
@@ -6,7 +6,7 @@
 	"isHighlightCrosshairEnabled": true,
 	"hudHighlightColor": 16711680,
 	"isShowingArmsInFirstPerson": false,
-	"isShowingOtherHandFirstPerson": true,
+	"isShowingOtherHandFirstPerson": false,
 	"isSweepingParticleEnabled": true,
 	"isTooltipAttackRangeEnabled": true,
 	"weaponSwingSoundVolume": 100,
--- a/.minecraft/versions/边境流放/config/charmofundying-server.toml
+++ b/.minecraft/versions/边境流放/config/charmofundying-server.toml
@@ -0,0 +1,9 @@
+#The vertical offset for rendering the totem on the player.
+#Range: -100.0 ~ 100.0
+yOffset = 0.0
+#The horizontal offset for rendering the totem on the player.
+#Range: -100.0 ~ 100.0
+xOffset = 0.0
+#If enabled, renders the equipped totem on players.
+renderTotem = true
+
--- a/.minecraft/versions/边境流放/config/dummmmmmy-client.toml
+++ b/.minecraft/versions/边境流放/config/dummmmmmy-client.toml
@@ -0,0 +1,41 @@
+
+#lots of cosmetic stuff in here
+[visuals]
+	#To edit the damage numbers color you'll have to edit the config file manually
+	#How much the dummy swings in degrees with respect to the damage dealt. default=0.75
+	#Range: 0.0 ~ 2.0
+	animation_intensity = 0.75
+	#Show hearths instead of damage dealt? (1 hearth = two damage)
+	show_hearths = false
+	#Show damage numbers on entity
+	damage_numbers = true
+	#Display particles fullbright
+	full_bright_damage_numbers = true
+	#How crits should be shown
+	#Allowed Values: OFF, COLOR, COLOR_AND_MULTIPLIER
+	crit_mode = "COLOR_AND_MULTIPLIER"
+	#Show hay particles when dealing damage
+	hay_particles = true
+	#Skin used by the dummy
+	#Allowed Values: DEFAULT, ORIGINAL, ALTERNATIVE, DUNGEONS
+	texture = "DEFAULT"
+
+	#Add here custom colors (in hex format) to associate with your damage types. This is a map from damage source ID to a color where you can add new entries for each
+	[visuals.damage_type_colors]
+		"minecraft:generic" = "#00FFFFFF"
+		"#dummmmmmy:is_wither" = "#00666666"
+		"minecraft:dragon_breath" = "#00E600FF"
+		"attributeslib:bleeding" = "#00810A0A"
+		"#dummmmmmy:is_fire" = "#00FF7700"
+		"minecraft:trident" = "#0000FF9D"
+		"#minecraft:is_lightning" = "#00FFF200"
+		"#dummmmmmy:is_thorn" = "#000FA209"
+		"dummmmmmy:true" = "#00910038"
+		"#dummmmmmy:is_explosion" = "#00FFBB29"
+		"minecraft:sonic_boom" = "#00074550"
+		"#minecraft:is_drowning" = "#001898E3"
+		"#minecraft:witch_resistant_to" = "#00844CE7"
+		"dummmmmmy:critical" = "#00FF0000"
+		"minecraft:wind_charge" = "#00BEF3FF"
+		"#dummmmmmy:is_cold" = "#0009D2FF"
+
--- a/.minecraft/versions/边境流放/config/dummmmmmy-common.toml
+++ b/.minecraft/versions/边境流放/config/dummmmmmy-common.toml
@@ -0,0 +1,40 @@
+
+[scarecrow]
+	#Equip a dummy with a pumpkin to make hit act as a scarecrow
+	#All animal entities will be scared. add here additional ones that are not included
+	mobs_whitelist = [""]
+	#Animal entities that will not be scared
+	mobs_blacklist = [""]
+	#Scaring radius
+	#Range: 0 ~ 100
+	scare_radius = 12
+
+[general]
+	#Does dps message update dynamically or will it only appear after each parse? 
+	#Allowed Values: DYNAMIC, STATIC, OFF
+	DPS_mode = "DYNAMIC"
+	#Enable this to prevent your equipment from getting damaged when attacking the dummy
+	disable_equipment_damage = true
+	#Time in ticks that it takes for a dummy to be considered out of combat after having recieved damage
+	#Range: 20 ~ 1000
+	maximum_out_of_combat_interval = 120
+	#Makes monsters target a dummy that is wearing a player head
+	dummy_decoy = false
+	#Makes dummy drop xp when hit. Training yay! Depends on damage done
+	#Range: 0.0 ~ 100.0
+	xp_per_damage_on_hit = 0.0
+	#Color of the boss health bar
+	#Allowed Values: PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE
+	boss_health_color = "YELLOW"
+	#Health of the dummy when in boss moe (wearing a banner)
+	#Range: 1 ~ 1000
+	boss_health = 200
+
+[mobs_damage_numbers]
+	#Show damage taken form
+	#Allowed Values: ALL_ENTITIES, ALL_PLAYERS, LOCAL_PLAYER, NONE
+	damage_mode = "NONE"
+	#Show healing taken for
+	#Allowed Values: ALL_ENTITIES, ALL_PLAYERS, LOCAL_PLAYER, NONE
+	healing_mode = "NONE"
+
--- a/.minecraft/versions/边境流放/config/fancymenu/customization/home.txt
+++ b/.minecraft/versions/边境流放/config/fancymenu/customization/home.txt
@@ -3,13 +3,13 @@ type = fancymenu_layout
 layout-meta {
  identifier = title_screen
  render_custom_elements_behind_vanilla = false
-  last_edited_time = 1709529084882
+  last_edited_time = 1734865346234
  is_enabled = true
  randommode = false
  randomgroup = 1
  randomonlyfirsttime = false
  layout_index = 0
-  [loading_requirement_container_meta:cb4869e5-91ac-4a35-bd45-ceb0db397ce6-1709528895101] = [groups:][instances:]
+  [loading_requirement_container_meta:610c104d-e93b-47e0-8d57-78d7e366819c-1734865235059] = [groups:][instances:]
 }

 customization {
@@ -36,8 +36,15 @@ element {
  instance_identifier = 9ceda531-8742-4cc4-aa24-b47996ea0a25-1708700133608
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-centered
  x = -81
  y = 0
@@ -60,8 +67,15 @@ element {
  instance_identifier = af7012be-559f-489a-b884-386b5fdb773a1694139218323
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
  x = 0
  y = 10
@@ -84,8 +98,15 @@ element {
  instance_identifier = 2416bd1b-9a52-47ba-9f56-40390aa17ed61694139299733
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-centered
  x = -59
  y = 55
@@ -151,8 +172,15 @@ element {
  instance_identifier = 045150c3-4b0f-4c93-958c-2780f74af3bf1694139774863
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = mid-left
  x = 35
  y = -57
@@ -178,12 +206,21 @@ element {
  description = 加入KOOK交流群
  label = 群
  navigatable = true
+  widget_active_state_requirement_container_identifier = 943c6ac1-13a6-4c21-8e2c-495af22205a9-1734865235061
+  [loading_requirement_container_meta:943c6ac1-13a6-4c21-8e2c-495af22205a9-1734865235061] = [groups:][instances:]
  element_type = custom_button
  instance_identifier = c4222d97-43fd-4623-94cc-412d21f99cc01697369415913
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 2560
+  auto_sizing_base_screen_height = 1336
+  sticky_anchor = false
  anchor_point = mid-right
  x = -27
  y = 74
@@ -224,8 +261,15 @@ element {
  instance_identifier = c2072852-fb9c-4df6-9520-5b3bd6ebcdeb-1708700720301
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = bottom-centered
  x = -100
  y = -14
@@ -238,6 +282,252 @@ element {
  [loading_requirement_container_meta:597ed5fe-1c5f-46f1-b5a5-4beb6f728b9e-1708700720301] = [groups:][instances:]
 }

+vanilla_button {
+  button_element_executable_block_identifier = 3bf6c7f6-0aa6-460a-929d-4fa9f90fc690-1708700099754
+  [executable_block:3bf6c7f6-0aa6-460a-929d-4fa9f90fc690-1708700099754][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = 9b259446-4d82-464d-9b89-76fba19ff984-1734865235061
+  [loading_requirement_container_meta:9b259446-4d82-464d-9b89-76fba19ff984-1734865235061] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_copyright_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
+  anchor_point = vanilla
+  x = 486
+  y = 324
+  width = 152
+  height = 10
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = eabed309-129c-44ca-9d05-2401f0c11bd4-1708700099754
+  [loading_requirement_container_meta:eabed309-129c-44ca-9d05-2401f0c11bd4-1708700099754] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = 413e8644-af54-4980-b69d-1dda9d186b40-1708161337788
+  [executable_block:413e8644-af54-4980-b69d-1dda9d186b40-1708161337788][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = 89635765-024e-405d-b2f0-5480094063f6-1734865235062
+  [loading_requirement_container_meta:89635765-024e-405d-b2f0-5480094063f6-1734865235062] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_quit_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
+  anchor_point = mid-right
+  x = -107
+  y = 51
+  width = 100
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = false
+  element_loading_requirement_container_identifier = 38aef8be-d21e-48d3-a847-530dd4148690-1708161337788
+  [loading_requirement_container_meta:38aef8be-d21e-48d3-a847-530dd4148690-1708161337788] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = efa548e5-842e-4931-bce3-a08466f3c764-1708161337784
+  [executable_block:efa548e5-842e-4931-bce3-a08466f3c764-1708161337784][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = bf12a25b-2c56-462a-89ba-4d9f7d377fa2-1734865235061
+  [loading_requirement_container_meta:bf12a25b-2c56-462a-89ba-4d9f7d377fa2-1734865235061] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_multiplayer_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
+  anchor_point = mid-right
+  x = -107
+  y = -18
+  width = 100
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = false
+  element_loading_requirement_container_identifier = 606360a0-5e4e-46a7-a4ca-1e7009df7514-1708161337784
+  [loading_requirement_container_meta:606360a0-5e4e-46a7-a4ca-1e7009df7514-1708161337784] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = a9a9a891-39c7-44a0-973c-9cd0248663e6-1708161337789
+  [executable_block:a9a9a891-39c7-44a0-973c-9cd0248663e6-1708161337789][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = f50dc504-8300-471f-a4d8-c04442818a60-1734865235062
+  [loading_requirement_container_meta:f50dc504-8300-471f-a4d8-c04442818a60-1734865235062] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_realms_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
+  anchor_point = vanilla
+  x = 322
+  y = 179
+  width = 98
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = false
+  element_loading_requirement_container_identifier = 749c3f69-a607-4ab3-b1ba-1ef16b05899e-1708161337789
+  [loading_requirement_container_meta:749c3f69-a607-4ab3-b1ba-1ef16b05899e-1708161337789] = [groups:][instances:]
+  is_hidden = true
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = 1971447d-df3c-4614-8f4c-14877fb73e37-1708161337789
+  [executable_block:1971447d-df3c-4614-8f4c-14877fb73e37-1708161337789][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = cdd71e22-5b06-4804-8d3d-0bc19fdc2d58-1734865235062
+  [loading_requirement_container_meta:cdd71e22-5b06-4804-8d3d-0bc19fdc2d58-1734865235062] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = forge_titlescreen_mods_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
+  anchor_point = mid-right
+  x = -107
+  y = 5
+  width = 100
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = false
+  element_loading_requirement_container_identifier = ffbfe4a4-4122-4197-92f9-d1929ade86a4-1708161337789
+  [loading_requirement_container_meta:ffbfe4a4-4122-4197-92f9-d1929ade86a4-1708161337789] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = bacdc57e-ee5a-4ed4-bcf3-78cd4dc5622d-1708161337788
+  [executable_block:bacdc57e-ee5a-4ed4-bcf3-78cd4dc5622d-1708161337788][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  widget_active_state_requirement_container_identifier = 428af733-ad93-4de4-8056-639cd05b5d48-1734865235061
+  [loading_requirement_container_meta:428af733-ad93-4de4-8056-639cd05b5d48-1734865235061] = [groups:][instances:]
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_language_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in_v2 = no_fading
+  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 2560
+  auto_sizing_base_screen_height = 1336
+  sticky_anchor = false
+  anchor_point = mid-right
+  x = -80
+  y = 74
+  width = 20
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = false
+  element_loading_requirement_container_identifier = 36eb1e23-c571-4967-9722-ce3ea8d56eac-1708161337788
+  [loading_requirement_container_meta:36eb1e23-c571-4967-9722-ce3ea8d56eac-1708161337788] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
 vanilla_button {
  button_element_executable_block_identifier = ba9a1a26-cb71-4acb-9f9d-7ad2cc63efe4-1708161337788
  [executable_block:ba9a1a26-cb71-4acb-9f9d-7ad2cc63efe4-1708161337788][type:generic] = [executables:]
@@ -247,12 +537,21 @@ vanilla_button {
  nine_slice_border_x = 5
  nine_slice_border_y = 5
  navigatable = true
+  widget_active_state_requirement_container_identifier = 118ebb9a-da8e-4091-ac64-eb066facf919-1734865235061
+  [loading_requirement_container_meta:118ebb9a-da8e-4091-ac64-eb066facf919-1734865235061] = [groups:][instances:]
  element_type = vanilla_button
  instance_identifier = mc_titlescreen_options_button
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = mid-right
  x = -107
  y = 28
@@ -279,12 +578,21 @@ vanilla_button {
  nine_slice_border_x = 5
  nine_slice_border_y = 5
  navigatable = true
+  widget_active_state_requirement_container_identifier = 5486b30f-b61c-48eb-acaa-c7678677c3c5-1734865235061
+  [loading_requirement_container_meta:5486b30f-b61c-48eb-acaa-c7678677c3c5-1734865235061] = [groups:][instances:]
  element_type = vanilla_button
  instance_identifier = mc_titlescreen_accessibility_button
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 2560
+  auto_sizing_base_screen_height = 1336
+  sticky_anchor = false
  anchor_point = mid-right
  x = -53
  y = 74
@@ -303,126 +611,40 @@ vanilla_button {
 }

 vanilla_button {
-  button_element_executable_block_identifier = 3bf6c7f6-0aa6-460a-929d-4fa9f90fc690-1708700099754
-  [executable_block:3bf6c7f6-0aa6-460a-929d-4fa9f90fc690-1708700099754][type:generic] = [executables:]
+  button_element_executable_block_identifier = 92ee0767-5d6e-4fb8-b171-f6ebd0515ac3-1734865235062
+  [executable_block:92ee0767-5d6e-4fb8-b171-f6ebd0515ac3-1734865235062][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
  nine_slice_border_x = 5
  nine_slice_border_y = 5
+  label = Q
  navigatable = true
+  widget_active_state_requirement_container_identifier = 2d90acb0-bf5a-43ba-8f3a-4d511406ed6e-1734865235062
+  [loading_requirement_container_meta:2d90acb0-bf5a-43ba-8f3a-4d511406ed6e-1734865235062] = [groups:][instances:]
  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_copyright_button
+  instance_identifier = 376346
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = vanilla
-  x = 495
-  y = 324
-  width = 143
-  height = 10
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = true
-  element_loading_requirement_container_identifier = eabed309-129c-44ca-9d05-2401f0c11bd4-1708700099754
-  [loading_requirement_container_meta:eabed309-129c-44ca-9d05-2401f0c11bd4-1708700099754] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
-vanilla_button {
-  button_element_executable_block_identifier = bacdc57e-ee5a-4ed4-bcf3-78cd4dc5622d-1708161337788
-  [executable_block:bacdc57e-ee5a-4ed4-bcf3-78cd4dc5622d-1708161337788][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_language_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 2560
+  auto_sizing_base_screen_height = 1336
+  sticky_anchor = false
  anchor_point = mid-right
-  x = -80
+  x = -107
  y = 74
  width = 20
  height = 20
  stretch_x = false
  stretch_y = false
-  stay_on_screen = false
-  element_loading_requirement_container_identifier = 36eb1e23-c571-4967-9722-ce3ea8d56eac-1708161337788
-  [loading_requirement_container_meta:36eb1e23-c571-4967-9722-ce3ea8d56eac-1708161337788] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
-vanilla_button {
-  button_element_executable_block_identifier = efa548e5-842e-4931-bce3-a08466f3c764-1708161337784
-  [executable_block:efa548e5-842e-4931-bce3-a08466f3c764-1708161337784][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_multiplayer_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = mid-right
-  x = -107
-  y = -18
-  width = 100
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = false
-  element_loading_requirement_container_identifier = 606360a0-5e4e-46a7-a4ca-1e7009df7514-1708161337784
-  [loading_requirement_container_meta:606360a0-5e4e-46a7-a4ca-1e7009df7514-1708161337784] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
-vanilla_button {
-  button_element_executable_block_identifier = 413e8644-af54-4980-b69d-1dda9d186b40-1708161337788
-  [executable_block:413e8644-af54-4980-b69d-1dda9d186b40-1708161337788][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_quit_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = mid-right
-  x = -107
-  y = 51
-  width = 100
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = false
-  element_loading_requirement_container_identifier = 38aef8be-d21e-48d3-a847-530dd4148690-1708161337788
-  [loading_requirement_container_meta:38aef8be-d21e-48d3-a847-530dd4148690-1708161337788] = [groups:][instances:]
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = 452577bc-59af-4820-a2e1-eff2d89d9f2e-1734865235062
+  [loading_requirement_container_meta:452577bc-59af-4820-a2e1-eff2d89d9f2e-1734865235062] = [groups:][instances:]
  is_hidden = false
  automated_button_clicks = 0
  nine_slice_slider_handle = false
@@ -439,12 +661,21 @@ vanilla_button {
  nine_slice_border_x = 5
  nine_slice_border_y = 5
  navigatable = true
+  widget_active_state_requirement_container_identifier = 60856ee7-9fc0-4c1b-a9e7-973c9d256565-1734865235062
+  [loading_requirement_container_meta:60856ee7-9fc0-4c1b-a9e7-973c9d256565-1734865235062] = [groups:][instances:]
  element_type = vanilla_button
  instance_identifier = mc_titlescreen_singleplayer_button
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = mid-right
  x = -107
  y = -41
@@ -462,77 +693,20 @@ vanilla_button {
  nine_slice_slider_handle_border_y = 5
 }

-vanilla_button {
-  button_element_executable_block_identifier = 1971447d-df3c-4614-8f4c-14877fb73e37-1708161337789
-  [executable_block:1971447d-df3c-4614-8f4c-14877fb73e37-1708161337789][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = forge_titlescreen_mods_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = mid-right
-  x = -107
-  y = 5
-  width = 100
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = false
-  element_loading_requirement_container_identifier = ffbfe4a4-4122-4197-92f9-d1929ade86a4-1708161337789
-  [loading_requirement_container_meta:ffbfe4a4-4122-4197-92f9-d1929ade86a4-1708161337789] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
-vanilla_button {
-  button_element_executable_block_identifier = a9a9a891-39c7-44a0-973c-9cd0248663e6-1708161337789
-  [executable_block:a9a9a891-39c7-44a0-973c-9cd0248663e6-1708161337789][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_realms_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = vanilla
-  x = 322
-  y = 179
-  width = 98
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = false
-  element_loading_requirement_container_identifier = 749c3f69-a607-4ab3-b1ba-1ef16b05899e-1708161337789
-  [loading_requirement_container_meta:749c3f69-a607-4ab3-b1ba-1ef16b05899e-1708161337789] = [groups:][instances:]
-  is_hidden = true
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
 deep_element {
  element_type = title_screen_logo
  instance_identifier = deep:title_screen_logo
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
  x = 103
  y = 30
@@ -551,13 +725,20 @@ deep_element {
  instance_identifier = deep:title_screen_branding
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
  x = 2
-  y = 303
-  width = 65
-  height = 29
+  y = 293
+  width = 105
+  height = 39
  stretch_x = false
  stretch_y = false
  stay_on_screen = false
@@ -571,8 +752,15 @@ deep_element {
  instance_identifier = deep:title_screen_splash
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = mid-right
  x = -90
  y = -60
@@ -591,8 +779,15 @@ deep_element {
  instance_identifier = deep:title_screen_realms_notification
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
  x = 343
  y = 162
@@ -611,12 +806,19 @@ deep_element {
  instance_identifier = deep:title_screen_forge_copyright
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
-  x = 533
+  x = 540
  y = 314
-  width = 106
+  width = 99
  height = 9
  stretch_x = false
  stretch_y = false
@@ -631,12 +833,19 @@ deep_element {
  instance_identifier = deep:title_screen_forge_top
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
-  fade_in = false
+  fade_in_v2 = no_fading
  fade_in_speed = 1.0
+  fade_out = no_fading
+  fade_out_speed = 1.0
+  base_opacity = 1.0
+  auto_sizing = false
+  auto_sizing_base_screen_width = 0
+  auto_sizing_base_screen_height = 0
+  sticky_anchor = false
  anchor_point = top-left
-  x = 250
+  x = 255
  y = 4
-  width = 141
+  width = 130
  height = 19
  stretch_x = false
  stretch_y = false
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/0C421990AC92D774.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/0C421990AC92D774.snbt
@@ -0,0 +1,28 @@
+{
+	default_hide_dependency_lines: false
+	default_quest_shape: ""
+	filename: "0C421990AC92D774"
+	group: ""
+	icon: "farmersdelight:stuffed_pumpkin_block"
+	id: "0C421990AC92D774"
+	order_index: 3
+	quest_links: [ ]
+	quests: [{
+		id: "11254D00607D054B"
+		rewards: [{
+			count: 64
+			id: "112FDBFF01BD994E"
+			item: "minecraft:bread"
+			type: "item"
+		}]
+		tasks: [{
+			id: "6D460D7619B2B992"
+			title: "1"
+			type: "checkmark"
+		}]
+		x: 0.0d
+		y: 0.0d
+	}]
+	subtitle: ["即将推出敬请期待！"]
+	title: "农耕"
+}
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/1.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/1.snbt
@@ -19,18 +19,12 @@
 		x: -2.0d
 		y: -1.0d
 	}]
-	order_index: 3
+	order_index: 4
 	quest_links: [ ]
 	quests: [
 		{
 			description: ["制作一个挖矿维度传送器"]
 			id: "31D0AB734F3E8E8D"
-			rewards: [{
-				exclude_from_claim_all: true
-				id: "12ADCD9ABD781E86"
-				table_id: 7825923329993381431L
-				type: "loot"
-			}]
 			tasks: [{
 				id: "3CD7B8A7BC5AAA61"
 				item: "mining_dimension:teleporter"
@@ -44,19 +38,6 @@
 			dependencies: ["31D0AB734F3E8E8D"]
 			description: ["在这个世界里，你将体验到真正的矿工的乐趣！"]
 			id: "33B7314528AB34A9"
-			rewards: [
-				{
-					count: 8
-					id: "3799A32D67F43F6A"
-					item: "minecraft:torch"
-					type: "item"
-				}
-				{
-					id: "318095315404C550"
-					item: "minecraft:diamond"
-					type: "item"
-				}
-			]
 			tasks: [{
 				dimension: "mining_dimension:mining"
 				id: "69CEA71FECEDA0F1"
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/1FAF2083B03B1C62.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/1FAF2083B03B1C62.snbt
@@ -13,39 +13,12 @@
 		x: 0.0d
 		y: 0.0d
 	}]
-	order_index: 4
+	order_index: 5
 	quest_links: [ ]
 	quests: [
 		{
 			description: ["钓一次鱼，然后会发生什么？"]
 			id: "58C1ABA6F0545F3F"
-			rewards: [
-				{
-					id: "1EFE159F58742A04"
-					item: {
-						Count: 1
-						id: "minecraft:fishing_rod"
-						tag: {
-							Damage: 0
-						}
-					}
-					type: "item"
-				}
-				{
-					id: "624DEE68929A87D8"
-					item: {
-						Count: 1
-						id: "minecraft:enchanted_book"
-						tag: {
-							StoredEnchantments: [{
-								id: "minecraft:luck_of_the_sea"
-								lvl: 2s
-							}]
-						}
-					}
-					type: "item"
-				}
-			]
 			tasks: [{
 				advancement: "minecraft:husbandry/fishy_business"
 				criterion: ""
@@ -59,12 +32,6 @@
 		{
 			description: ["有了它你就可以在你的庇护所和各种资源点之间快速移动"]
 			id: "4A250AB9D0F11696"
-			rewards: [{
-				count: 4
-				id: "2A059BE09AFACD0D"
-				item: "minecraft:ender_pearl"
-				type: "item"
-			}]
 			tasks: [{
 				icon: "waystones:waystone"
 				id: "3652C72635D40DE6"
@@ -84,12 +51,6 @@
 				"你可以在第一个格子里放碗来做炖菜"
 			]
 			id: "14322D7F1BE6ACA6"
-			rewards: [{
-				count: 8
-				id: "6E97A080F15F3C87"
-				item: "minecraft:wheat"
-				type: "item"
-			}]
 			tasks: [{
 				id: "7CF1FB0EABE6DFA1"
 				item: "culinaryconstruct:culinary_station"
@@ -187,27 +148,38 @@
 			description: ["用一个拉杆让刷怪笼停止工作"]
 			icon: "minecraft:lever"
 			id: "1AEE36C952CD0C69"
-			rewards: [{
-				id: "7F1845BEE5606F3D"
+			tasks: [{
+				id: "6C3B1550517EFB72"
 				item: "minecraft:lever"
 				type: "item"
 			}]
-			tasks: [
-				{
-					id: "6C3B1550517EFB72"
-					item: "minecraft:stick"
-					type: "item"
-				}
-				{
-					id: "11847AC5D6EFF6C7"
-					item: "minecraft:cobblestone"
-					type: "item"
-				}
-			]
 			title: "停！"
 			x: 4.0d
 			y: 2.0d
 		}
+		{
+			description: [
+				"&oTake The Journey&r"
+				"可以用探险家指南针来搜索遗迹的具体位置"
+			]
+			id: "649F6DF111372E42"
+			rewards: [{
+				id: "2DB74CB29E2CC93F"
+				item: {
+					Count: 1
+					id: "explorerscompass:explorerscompass"
+					tag: { }
+				}
+				type: "item"
+			}]
+			tasks: [{
+				id: "6ADBF0C96998F9A3"
+				title: "探索这个世界吧！"
+				type: "checkmark"
+			}]
+			x: 0.0d
+			y: -2.0d
+		}
 	]
 	title: "神奇的世界"
 }
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/2018EB1255AEE34B.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/2018EB1255AEE34B.snbt
@@ -11,12 +11,56 @@
 		{
 			description: ["开启新手装备袋，开始你的旅途"]
 			id: "3BF15C33894DC2D5"
-			rewards: [{
-				exclude_from_claim_all: true
-				id: "5410FAA1F3235679"
-				table_id: 7825923329993381431L
-				type: "loot"
-			}]
+			rewards: [
+				{
+					id: "07B9E872BAAB63EC"
+					item: {
+						Count: 1
+						id: "mmorpg:stat_soul"
+						tag: {
+							CustomModelData: 10
+							mmorpg_stat_soul: "{\"tier\":0,\"slot\":\"helmet\",\"rar\":\"common\",\"fam\":\"NONE\",\"uniq\":\"\",\"force_tag\":\"\",\"can_sal\":true}"
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "31786C15E366681D"
+					item: {
+						Count: 1
+						id: "mmorpg:stat_soul"
+						tag: {
+							CustomModelData: 9
+							mmorpg_stat_soul: "{\"tier\":0,\"slot\":\"chest\",\"rar\":\"common\",\"fam\":\"NONE\",\"uniq\":\"\",\"force_tag\":\"\",\"can_sal\":true}"
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "4211BD13589B909B"
+					item: {
+						Count: 1
+						id: "mmorpg:stat_soul"
+						tag: {
+							CustomModelData: 8
+							mmorpg_stat_soul: "{\"tier\":0,\"slot\":\"pants\",\"rar\":\"common\",\"fam\":\"NONE\",\"uniq\":\"\",\"force_tag\":\"\",\"can_sal\":true}"
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "715E2CC590617143"
+					item: {
+						Count: 1
+						id: "mmorpg:stat_soul"
+						tag: {
+							CustomModelData: 7
+							mmorpg_stat_soul: "{\"tier\":0,\"slot\":\"boots\",\"rar\":\"common\",\"fam\":\"NONE\",\"uniq\":\"\",\"force_tag\":\"\",\"can_sal\":true}"
+						}
+					}
+					type: "item"
+				}
+			]
 			tasks: [{
 				id: "7F25F03BAF332FC0"
 				item: "mmorpg:newbie_gear_bag"
@@ -29,12 +73,6 @@
 			dependencies: ["3BF15C33894DC2D5"]
 			description: ["击杀怪物以获得经验。现在来试试吧！"]
 			id: "1374BA63E81508AE"
-			rewards: [{
-				exclude_from_claim_all: true
-				id: "6E0913947A187B48"
-				table_id: 7825923329993381431L
-				type: "loot"
-			}]
 			tasks: [{
 				entity: "minecraft:zombie"
 				icon: "minecraft:zombie_head"
@@ -43,19 +81,13 @@
 				type: "kill"
 				value: 10L
 			}]
-			x: 0.0d
+			x: 3.0d
 			y: 1.0d
 		}
 		{
 			dependencies: ["1374BA63E81508AE"]
 			description: ["寻找一个刷怪笼，并制作一个经验农场"]
 			id: "51A198D8EF8312F9"
-			rewards: [{
-				exclude_from_claim_all: true
-				id: "287661D15A82E7A3"
-				table_id: 1442380370348188306L
-				type: "loot"
-			}]
 			tasks: [{
 				icon: "minecraft:spawner"
 				id: "0F7204BB3362914B"
@@ -65,32 +97,111 @@
 				to_observe: "minecraft:spawner"
 				type: "observation"
 			}]
-			x: 0.0d
+			x: 3.0d
 			y: 2.0d
 		}
 		{
-			dependencies: ["51A198D8EF8312F9"]
+			dependencies: ["0BDED87694D2852E"]
 			description: [
-				"按&b&lH&r键可以打开挖矿与砍杀的属性界面，在这里你可以加点等等"
-				"点击右边的天赋可以点天赋点"
-				""
-				"注意：天赋是按照职业来进行分类的，请不要跨职业加点，会非常坐牢！"
+				"点击挖矿与砍杀GUI右边的天赋可以点天赋点"
+				"天赋是按照职业来进行分类的，请不要跨职业加点，会非常坐牢！"
+				"加点后除非你有重置点数，否则是不能回退的，只能重置！"
 			]
 			id: "1FCB4F7887312327"
-			rewards: [{
-				exclude_from_claim_all: true
-				id: "7E0CD6FF441F39C7"
-				table_id: 1442380370348188306L
-				type: "loot"
-			}]
 			tasks: [{
 				id: "169E49E752270A65"
 				title: "升级天赋"
 				type: "checkmark"
 			}]
+			x: 1.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["3BF15C33894DC2D5"]
+			description: [
+				"按&b&lH&r键可以打开挖矿与砍杀的GUI，在这里你可以对你的角色进行调整"
+				"{image:broderexile:textures/mmorpg_main_1.png width:200 height:160 align:center}"
+				"{@pagebreak}"
+				"1：你现在的&l等级"
+				"&r2：你的&l恩宠值&r，越高，开箱子出稀有物品的概率越高，死亡会扣除"
+				"3：可用的&l属性点&r，用于属性加点"
+				"4、5、6：属性，分别对应&l力量&r、&l智力&r、&l敏捷&r。点击+号为属性加点。右侧的数字为当前属性的属性点，鼠标悬停在+号可以查看每次加点可以增加的属性以及总属性"
+				"{@pagebreak}"
+				"7：角色，查看和切换其他角色"
+				"8：维基，查看所有的装备以及详细信息"
+				"9：拆解:，控制是否自动拆解拾取的装备"
+				"10：辅助功能，开关辅助功能"
+				"11：属性，更详细的查看属性"
+				"12：职业，为技能加点"
+				"13：法术快捷栏，放置技能的位置，安装宝石和光环"
+				"14：天赋，天赋点，增加属性"
+				"15：珠宝，安装珠宝"
+				"16：地图升级"
+			]
+			id: "0BDED87694D2852E"
+			tasks: [{
+				id: "1D34DB0A9C4FD319"
+				title: "打开挖砍菜单"
+				type: "checkmark"
+			}]
+			x: 0.0d
+			y: 1.0d
+		}
+		{
+			dependencies: ["0BDED87694D2852E"]
+			description: [
+				"点击挖矿与砍杀GUI右边的职业可以学习对应职业的技能"
+				"{image:broderexile:textures/mmorpg_skill.png width:100 height:100 align:center}点击上方的箭头可以切换职业"
+				"点击对应的技能图标学习和加点"
+				"注意："
+				"你只能学两个职业的技能，也就是不能跨多个职业加点"
+				"技能有最低MMO等级要求，不满足条件的技能是学不了的"
+				"技能一旦学习无法回退，只能重置！"
+			]
+			id: "628F882F41196072"
+			tasks: [{
+				id: "6A9632AF5304D017"
+				title: "学习技能"
+				type: "checkmark"
+			}]
+			x: 0.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["628F882F41196072"]
+			description: [
+				"点击挖矿与砍杀GUI右边的法术快捷栏可以把你学习的法术放到快捷栏里"
+				"{image:broderexile:textures/mmorpg_skill_bar.png width:130 height:100 align:center}"
+				"从左到右的默认快捷键：R V C G 加shift键"
+			]
+			id: "5D8D1DC2F7C05FAA"
+			tasks: [{
+				id: "5A6C7838F0F09CD2"
+				title: "把技能放在快捷栏中"
+				type: "checkmark"
+			}]
 			x: 0.0d
 			y: 3.0d
 		}
+		{
+			dependencies: ["0BDED87694D2852E"]
+			description: [
+				"点击挖矿与砍杀GUI中间的属性可以点属性点"
+				"还记得吗？点击+号就可以加点"
+				"注意："
+				"所有的武器除了等级外还有属性要求，想玩什么武器就加对应的属性点"
+				"你可以每个属性都点，但是有可能会出现武器因为你不满足最低属性要求而无法使用"
+				"属性点无法回退，只能重置！"
+			]
+			id: "3F08CFA04E3969B6"
+			tasks: [{
+				id: "3F3934157C014F30"
+				title: "属性加点"
+				type: "checkmark"
+			}]
+			x: -1.0d
+			y: 2.0d
+		}
 	]
 	title: "挖矿与砍杀"
 }
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/339F028E0671CDB4.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/339F028E0671CDB4.snbt
@@ -11,7 +11,7 @@
 		}
 	}
 	id: "339F028E0671CDB4"
-	order_index: 6
+	order_index: 7
 	quest_links: [ ]
 	quests: [
 		{
--- a/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/3F0EAD1122B4C1FC.snbt
+++ b/.minecraft/versions/边境流放/config/ftbquests/quests/chapters/3F0EAD1122B4C1FC.snbt
@@ -12,7 +12,7 @@
 		x: 0.0d
 		y: -5.0d
 	}]
-	order_index: 5
+	order_index: 6
 	quest_links: [ ]
 	quests: [{
 		description: ["钥匙必须激活才能使用，激活需要手持钥匙对着末地传送门框架的内部黑色凹槽部位右键"]
--- a/.minecraft/versions/边境流放/config/inventoryhud-client.toml
+++ b/.minecraft/versions/边境流放/config/inventoryhud-client.toml
@@ -0,0 +1,223 @@
+
+#Settings for Inventory HUD
+[inventoryhud]
+	#Inventory HUD mini mode
+	invMini = false
+	#Inventory HUD vertical mode
+	invVert = false
+	#Inventory HUD alpha
+	#Range: 0 ~ 100
+	invAlpha = 0
+	#Toggle on by default
+	byDefault = false
+	#Animate recently picked up items
+	animatedInv = true
+	#Hide background if inventory is empty
+	hideBackground = true
+	#Show Inventory HUD when debug menu is open
+	invWithDebug = true
+
+#Settings for ArmorStatus HUD
+[armorhud]
+	#Is Armor Damage HUD enabled
+	ArmorDamage = true
+	#Hide if durability is above this (in percentage):
+	#Range: 0 ~ 100
+	armAbove = 100
+	#Show/Hide armor
+	showArmor = true
+	#Show/Hide armor
+	showMain = true
+	#Show/Hide armor
+	showOff = true
+	#Show/Hide armor
+	showArrows = true
+	#Show/Hide armor
+	showInv = true
+	#Armor HUD durability view (PERCENTAGE, DAMAGE, DAMAGE LEFT)
+	#Allowed Values: PERCENTAGE, DAMAGE, DAMAGE_LEFT, OFF
+	armView = "DAMAGE_LEFT"
+	#Show item durability bar
+	armBars = true
+	#Move all items at once or each one
+	moveAll = true
+	#Show/Hide empty slot icon
+	showEmpty = true
+	#Show overall count of items in main/off hand
+	showCount = true
+	#ArmorHUD scale in persentage from 50 to 150
+	#Range: 50 ~ 150
+	armScale = 100
+	#Show Armor HUD when debug menu is open
+	armWithDebug = true
+	#Show arrows count when no weapon in your hands
+	showArrowsWithoutWeapon = true
+
+#Settings for Potions HUD
+[potionshud]
+	#Is Potions HUD enabled
+	Potions = true
+	#Potion HUD alpha
+	#Range: 0 ~ 100
+	potAlpha = 100
+	#Potion HUD gap
+	#Range: -5 ~ 5
+	potGap = 0
+	#Potion HUD mini mode
+	potMini = true
+	#Potion HUD horizontal mode
+	potHor = true
+	#Full bar duration
+	#Range: > 1
+	barDuration = 300
+	#Show hidden effects
+	showHiddenEffects = true
+	#Disable icons for effects in this list
+	effectsBlackList = []
+	#Show Potion HUD when debug menu is open
+	potWithDebug = true
+	#Show all levels of effects
+	potionLevels = true
+
+#DONT TOUCH THESE FIELDS!
+[positions]
+	#Inventory HUD vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	invValign = "BOTTOM"
+	#Inventory HUD horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	invHalign = "MIDDLE"
+	#Inventory HUD position (X)
+	#Range: -9999 ~ 9999
+	xPos = 0
+	#Inventory HUD position (Y)
+	#Range: -9999 ~ 9999
+	yPos = 150
+	#Armor HUD vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	armValign = "BOTTOM"
+	#Armor HUD horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	armHalign = "LEFT"
+	#Armor HUD position (X)
+	#Range: -9999 ~ 9999
+	xArmPos = 137
+	#Armor HUD position (Y)
+	#Range: -9999 ~ 9999
+	yArmPos = 111
+	#Potion HUD vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	potValign = "BOTTOM"
+	#Potion HUD horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	potHalign = "MIDDLE"
+	#Potion HUD position (X)
+	#Range: -9999 ~ 9999
+	xPotionPos = 0
+	#Potion HUD position (Y)
+	#Range: -9999 ~ 9999
+	yPotionPos = 92
+	#Helmet position (X)
+	#Range: -9999 ~ 9999
+	helmPosX = 103
+	#Helmet position (Y)
+	#Range: -9999 ~ 9999
+	helmPosY = 54
+	#Chestplate position (X)
+	#Range: -9999 ~ 9999
+	chestPosX = 103
+	#Chestplate position (Y)
+	#Range: -9999 ~ 9999
+	chestPosY = 37
+	#Leggings position (X)
+	#Range: -9999 ~ 9999
+	legPosX = -103
+	#Leggings position (Y)
+	#Range: -9999 ~ 9999
+	legPosY = 54
+	#Boots position (X)
+	#Range: -9999 ~ 9999
+	bootPosX = -103
+	#Boots position (Y)
+	#Range: -9999 ~ 9999
+	bootPosY = 37
+	#MainHand position (X)
+	#Range: -9999 ~ 9999
+	mainPosX = 103
+	#MainHand position (Y)
+	#Range: -9999 ~ 9999
+	mainPosY = 71
+	#OffHand position (X)
+	#Range: -9999 ~ 9999
+	offPosX = -103
+	#OffHand position (Y)
+	#Range: -9999 ~ 9999
+	offPosY = 71
+	#Arrows position (X)
+	#Range: -9999 ~ 9999
+	arrPosX = 103
+	#Arrows position (Y)
+	#Range: -9999 ~ 9999
+	arrPosY = 20
+	#InvIcon position (X)
+	#Range: -9999 ~ 9999
+	invPosX = -103
+	#InvIcon position (Y)
+	#Range: -9999 ~ 9999
+	invPosY = 20
+	#Helmet horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	helmHal = "MIDDLE"
+	#Helmet vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	helmVal = "BOTTOM"
+	#Chestplate horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	chestHal = "MIDDLE"
+	#Chestplate vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	chestVal = "BOTTOM"
+	#Leggings horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	legHal = "MIDDLE"
+	#Leggings vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	legVal = "BOTTOM"
+	#Boots horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	bootHal = "MIDDLE"
+	#Boots vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	bootVal = "BOTTOM"
+	#MainHand horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	mainHal = "MIDDLE"
+	#MainHand vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	mainVal = "BOTTOM"
+	#OffHand horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	offHal = "MIDDLE"
+	#OffHand vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	offVal = "BOTTOM"
+	#Arrows horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	arrHal = "MIDDLE"
+	#Arrows vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	arrVal = "BOTTOM"
+	#InvIcon horizontal align
+	#Allowed Values: LEFT, MIDDLE, RIGHT
+	invHal = "MIDDLE"
+	#InvIcon vertical align
+	#Allowed Values: TOP, CENTER, BOTTOM
+	invVal = "BOTTOM"
+
+#Notification settings
+[notification]
+	#Last notified mod version
+	lastNotifiedVersion = "4.3.2508"
+	#Notify more than once
+	keepNotifying = true
+
--- a/.minecraft/versions/边境流放/config/justzoom/config.txt
+++ b/.minecraft/versions/边境流放/config/justzoom/config.txt
@@ -1,16 +0,0 @@
-##[zoom]
-
-[The base zoom factor before zooming in or out.]
-D:base_zoom_factor = '0.25';
-[Caps the maximum FOV when zooming out, so you can't zoom out more than your normal FOV. Default = true]
-B:zoom_out_cap = 'true';
-[If the camera should move smoothly when zoomed.]
-B:smooth_camera_on_zoom = 'true';
-[How much to zoom out per scroll.]
-D:zoom_out_per_scroll = '0.05';
-[If the zoom factor should reset to the base zoom factor when stop zooming. Default = true]
-B:reset_zoom_factor = 'true';
-[How much to zoom in per scroll.]
-D:zoom_in_per_scroll = '0.05';
-[How fast the zoom should interpolate between the current FOV and the modified/zoomed FOV. Higher values mean faster interpolation. Default = 0.1 (10 frames), Min = 0.01 (100 frames), Max = 1 (1 frame)]
-D:lerp_amount = '0.1';
--- a/.minecraft/versions/边境流放/config/mine_and_slash-client.toml
+++ b/.minecraft/versions/边境流放/config/mine_and_slash-client.toml
@@ -18,7 +18,7 @@
 	#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"
+	GUI_POSITION = "BOTTOM_CENTER"
 	#Allowed Values: BORDER, FULL
 	ITEM_RARITY_BACKGROUND_TYPE = "FULL"
 	#Allowed Values: RPG, NONE
@@ -28,11 +28,11 @@
 	#Range: 0 ~ 1000
 	REMOVE_EMPTY_TOOLTIP_LINES_IF_MORE_THAN_X_LINES = 35
 	#Range: 0.10000000149011612 ~ 1.0
-	SPELL_PARTICLE_MULTI = 1.0
+	SPELL_PARTICLE_MULTI = 0.5
 	#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
+	USE_SPELL_ANIMATIONS = false
 	#Allowed Values: DEFAULT, IN_A_ROW
 	DAMAGE_PARTICLE_STYLE = "DEFAULT"

--- a/.minecraft/versions/边境流放/config/moonlight-client.toml
+++ b/.minecraft/versions/边境流放/config/moonlight-client.toml
@@ -0,0 +1,13 @@
+
+[general]
+	#Merge all dynamic resource packs from all mods that use this library into a single pack
+	merge_dynamic_packs = true
+	#Prevents map texture from being upladed to GPU when only map markers have changed.Could increase performance
+	lazy_map_upload = true
+	#Renders map textures using mipmap. Vastly improves look from afar as well when inside a Map Atlas from Map Atlases or similar. Set to 0 to have no mipmap like vanilla
+	#Range: 0 ~ 4
+	maps_mipmap = 3
+	#Fix minecraft entity shading to be exactly the same that blocks use. (1 for up,0.8 for north, 0.6 for west and 0.5 for down).This means that if you have a model and render it with a tile renderer or entity it will appear identical as one rendered via baked models.Using no gui will prevent it from changing item rendered in GUIs, in case you dont like that look.Note there is a known compat issue with Figura mod. Keep this True or False with that one
+	#Allowed Values: FALSE, NO_GUI, TRUE
+	consistent_entity_renderer_shading = "NO_GUI"
+
--- a/.minecraft/versions/边境流放/config/moonlight-common.toml
+++ b/.minecraft/versions/边境流放/config/moonlight-common.toml
@@ -0,0 +1 @@
+
--- a/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_main_1.png
+++ b/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_main_1.png
--- a/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_skill.png
+++ b/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_skill.png
--- a/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_skill_bar.png
+++ b/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/broderexile/textures/mmorpg_skill_bar.png
--- a/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/mmorpg/lang/zh_cn.json
+++ b/.minecraft/versions/边境流放/config/openloader/resources/BroderExile-配套资源包/assets/mmorpg/lang/zh_cn.json
@@ -0,0 +1,167 @@
+{
+    "item.mmorpg.coin.prophecy": "\u00A7d预言币",
+    "item.mmorpg.map_creator": "创建冒险地图",
+    "item.mmorpg.potions.full_reset_ascendancy": "大型重置卓越药水",
+	"item.mmorpg.potions.full_reset_passive": "大型重置被动药水",
+	"item.mmorpg.potions.full_reset_spell": "大型重置法术药水",
+	"item.mmorpg.potions.full_reset_stat": "大型重置统计药水",
+	"item.mmorpg.potions.full_reset_talent": "大型重置天赋药水",
+    "item.mmorpg.potions.reset_points_ascendancy": "小型重置卓越药水",
+	"item.mmorpg.potions.reset_points_passive": "小型重置被动药水",
+	"item.mmorpg.potions.reset_points_spell": "小型重置法术药水",
+	"item.mmorpg.potions.reset_points_stat": "小型重置统计药水",
+	"item.mmorpg.potions.reset_points_talent": "小型重置天赋药水",
+
+    "mmorpg.buff_consumption.elixir": "药剂",
+
+    "mmorpg.chat.boss_arena_unlocked": "首领区域：开启",
+    "mmorpg.chat.boss_killed": "首领已被击败",
+    "mmorpg.chat.craft_prof_mat_source": "通过 %1$s 职业的工作站制作",
+    "mmorpg.chat.current_map_exploration_percent": "地图探索度：%1$s",
+    "mmorpg.chat.map_device_desc": "用于进入地牢维度。\n\n点击使用冒险地图物品\n\n注意：不是原版地图物品",
+    "mmorpg.chat.map_exploration_rarity": "%1$s 地图探索 %2$s",
+    "mmorpg.chat.map_finished_spawning": "地图探索完成！",
+	"mmorpg.chat.prof_mat_source": "通过%1$s职业采集",
+    "mmorpg.chat.reset_full_potion_desc": "重置并返还所有已花费的点数。",
+    "mmorpg.chat.reset_points_potion_desc": "提供10点重置点数\n\n这些点数可用于选择性遗忘技能\n\n你可以通过右键点击来遗忘大多数技能",
+
+	"mmorpg.currency.socket_adder": "挖掘宝珠",
+    
+	"mmorpg.gear_type.trident": "三叉戟",
+    
+	"mmorpg.gearslot.trident": "三叉戟",
+
+    "mmorpg.gui.area_level": "区域等级：",
+    "mmorpg.gui.passive_points": "被动技能点数：",
+    "mmorpg.gui.respec_points": "重置点数：%1$s",
+    "mmorpg.gui.spell_points": "法术点数：",
+
+	"mmorpg.item_mods.add_10_perc_unique_stats": "为独特属性增加%1$s百分比",
+	"mmorpg.item_mods.add_1_to_5_gear_quality": "增加%1$s品质",
+	"mmorpg.item_mods.add_5_perc_unique_stats": "为独特属性增加%1$s百分比",
+	"mmorpg.item_mods.add_potential": "增加%1$s潜力",
+	"mmorpg.item_mods.add_socket": "增加%1$s个插槽",
+	"mmorpg.item_mods.affix_number_reroll": "重新生成词缀数值",
+	"mmorpg.item_mods.corrupt_gear": "腐化物品，使其不可修改，并添加随机数量的腐化词缀",
+	"mmorpg.item_mods.corrupt_gear_no_affix": "腐化物品，使其不可修改",
+	"mmorpg.item_mods.destroy_item": "摧毁物品！",
+	"mmorpg.item_mods.do_nothing": "无事发生",
+	"mmorpg.item_mods.downgrade_random_affix": "降低稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.extract_gem": "从插槽中提取%1$s",
+	"mmorpg.item_mods.extract_rune": "从插槽中提取%1$s",
+	"mmorpg.item_mods.force_soul_tag_armor_stat": "强制灵魂生成%1$s",
+	"mmorpg.item_mods.force_soul_tag_dodge_stat": "强制灵魂生成%1$s",
+	"mmorpg.item_mods.force_soul_tag_magic_shield_stat": "强制灵魂生成%1$s",
+	"mmorpg.item_mods.increment_uses_level_up": "增加使用次数",
+	"mmorpg.item_mods.increment_uses_random_mythic_affix": "增加使用次数",
+	"mmorpg.item_mods.increment_uses_sharpening_stone": "增加使用次数",
+	"mmorpg.item_mods.increment_uses_sure_jewel_up": "增加使用次数",
+	"mmorpg.item_mods.jewel_corrupt": "腐化宝石",
+	"mmorpg.item_mods.reduce_5_perc_unique_stats": "为独特属性减少%1$s百分比",
+	"mmorpg.item_mods.reroll_infusion": "重新生成注入词缀",
+	"mmorpg.item_mods.reroll_lowest_affix": "将%1$s重新生成为%2$s",
+	"mmorpg.item_mods.reroll_random_affix": "将%1$s重新生成为%2$s",
+	"mmorpg.item_mods.reroll_random_affix_to_mythic": "将%1$s重新生成为%2$s",
+	"mmorpg.item_mods.sharpening_stone_quality_0": "增加%1$s品质",
+	"mmorpg.item_mods.sharpening_stone_quality_1": "增加%1$s品质",
+	"mmorpg.item_mods.sharpening_stone_quality_2": "增加%1$s品质",
+	"mmorpg.item_mods.sharpening_stone_quality_3": "增加%1$s品质",
+	"mmorpg.item_mods.sharpening_stone_quality_4": "增加%1$s品质",
+	"mmorpg.item_mods.sharpening_stone_quality_5": "增加%1$s品质",
+	"mmorpg.item_mods.up_corrupt_affix": "提升腐化%1$s的稀有度",
+	"mmorpg.item_mods.upgrade_jewel_affix_rarity": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_lowest_affix": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_random_affix": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_common": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_epic": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_legendary": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_mythic": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_rare": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_runeword": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_uncommon": "提升稀有度并重新生成%1$s的数值",
+	"mmorpg.item_mods.upgrade_specific_rar_unique": "提升稀有度并重新生成%1$s的数值",
+    
+	"mmorpg.item_req.can_add_sockets": "必须有额外的插槽",
+	"mmorpg.item_req.has_affix_common": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_epic": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_legendary": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_mythic": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_rare": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_runeword": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_uncommon": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affix_unique": "必须有%1$s词缀",
+	"mmorpg.item_req.has_affixes": "必须有词缀",
+	"mmorpg.item_req.has_corrupt_affixes": "必须有腐化词缀",
+	"mmorpg.item_req.has_infusion": "必须带有注入",
+	"mmorpg.item_req.has_socketed_gem": "必须镶嵌有%1$s",
+	"mmorpg.item_req.has_socketed_rune": "必须镶嵌有%1$s",
+	"mmorpg.item_req.is_common": "必须是%1$s稀有度",
+	"mmorpg.item_req.is_under_20_quality": "品质必须低于%1$s",
+	"mmorpg.item_req.is_under_21_quality": "品质必须低于%1$s",
+	"mmorpg.item_req.is_not_corrupted": "不得损坏",
+	"mmorpg.item_req.is_single_item": "必须是单个物品",
+	"mmorpg.item_req.max_uses_level_up": "最多使用%1$s次",
+	"mmorpg.item_req.max_uses_random_mythic_affix": "最多使用%1$s次",
+	"mmorpg.item_req.max_uses_sharpening_stone": "最多使用%1$s次",
+	"mmorpg.item_req.max_uses_sure_jewel_up": "最多使用%1$s次",
+	"mmorpg.item_req.not_crafted_gear": "不能是制作的物品",
+
+    "mmorpg.item_tips.buff_consumable_duration_minutes": "持续时间：%1$s分钟",
+    "mmorpg.item_tips.buff_consumable_info": "你可以为每种类型激活一种消耗品：\n药剂、肉食和海鲜。",
+	"mmorpg.item_tips.buff_consumable_type": "%1$s消耗品",
+    "mmorpg.item_tips.drag_and_drop_to_use": "[拖放物品以使用]",
+    "mmorpg.item_tips.drop_chance": "掉落几率：%1$s",
+    "mmorpg.item_tips.drop_level_range": "掉落等级：%1$s",
+	"mmorpg.item_tips.gem_item_usage": "用于嵌入带有插槽的装备。\n也可以通过制作获得",
+	"mmorpg.item_tips.infusion_gear_level_range": "装备等级范围：%1$s - %2$s",
+    "mmorpg.item_tips.item_type": "物品类型：%1$s",
+    "mmorpg.item_tips.loot_chest_key_desc": "用于解锁从钓鱼职业获得的战利品箱。",
+    "mmorpg.item_tips.map_creator_item": "创建一张全新的普通冒险地图",
+    "mmorpg.item_tips.prof_mat_level_range_info": "当你的职业等级达到：",
+
+    "mmorpg.profession.desc.farming": "耕种让你有机会通过收割小麦、土豆等作物获得额外的自定义材料。你可以在《挖矿与砍杀》菜单 > 维基界面查看哪些作物提供经验。",
+    "mmorpg.profession.desc.fishing": "钓鱼让你有机会通过钓鱼获得额外的自定义材料。",
+    "mmorpg.profession.desc.gear_crafting": "装备制作是一种将采集职业的材料转化为新装备的制作职业。",
+    "mmorpg.profession.desc.husbandry": "畜牧让你有机会通过繁殖动物获得额外的自定义材料。",
+    "mmorpg.profession.desc.mining": "采矿让你有机会通过挖掘矿石获得额外的自定义材料。你可以在《挖矿与砍杀》菜单 > 维基界面查看哪些矿石提供经验。",
+    "mmorpg.profession.desc.salvaging": "拆解是在拆解站将废弃战利品转化为有用材料的过程。你只能拆解带有《挖矿与砍杀》灵魂的装备以及其他《挖矿与砍杀》稀有度物品。",
+
+    "mmorpg.stat.out_of_combat_regen": "脱战状态回复",
+    
+	"mmorpg.tag.gear_slot.trident": "三叉戟",
+
+	"mmorpg.word.always_does": "总是：",
+    "mmorpg.word.delete": "删除",
+	"mmorpg.word.delete_desc": "删除角色！\n\n警告，这不可撤销！",
+    "mmorpg.word.exp_chat_messages": "获得经验值时在聊天中发送消息\n\n你可以将鼠标悬停在其上以获取有用的信息，例如指数乘数",
+	"mmorpg.word.everyone_is_ally": "默认情况下，米的法术仅针对你的团队成员和你自己。\n\n启用此功能后，你的治疗、增益等将针对所有人，包括可能的敌人！",
+	"mmorpg.word.load": "加载",
+	"mmorpg.word.load_char_desc": "加载角色",
+	"mmorpg.word.map_upgrade": "地图升级",
+	"mmorpg.word.reroll_map": "刷新地图稀有度",
+    "mmorpg.word.downgrade_map": "降低地图品质",
+	"mmorpg.word.downgrade_map_desc": "地图变得更容易，但回报也更少。",
+    "mmorpg.word.item_types": "物品类型：",
+	"mmorpg.word.lowest_rarity_affix": "最低稀有度词缀",
+    "mmorpg.word.new_character": "新建角色",
+	"mmorpg.word.new_character_desc": "新建一个角色\n\n名称必须是唯一的",
+    "mmorpg.word.no_map_to_upgrade": "你当前没有任何地图。",
+    "mmorpg.word.profession_messages": "当你获得职业经验时提供一个简短的消息。\n\n你可以将鼠标悬停在其上以获取有用的信息，例如经验的修改方式",
+	"mmorpg.word.random_affix": "随机词缀",
+    "mmorpg.word.random_outcome": "随机结果：",
+    "mmorpg.word.rename": "重命名",
+	"mmorpg.word.rename_desc": "重命名当前选定的角色",
+	"mmorpg.word.reroll_map_desc": "刷新地图词缀但保留稀有度。",
+    "mmorpg.word.soulless_gear": "无魂装备",
+	"mmorpg.word.specific_rarity_affix": "%1$s词缀",
+    "mmorpg.word.teleport_to_boss": "进入首领区域！",
+    "mmorpg.word.upgrade_map": "升级地图品质",
+    "mmorpg.word.upgrade_map_desc": "地图变得更加困难，但也更有价值。",
+	"mmorpg.word.upgradeinfusion": "升级注入",
+    "mmorpg.word.usable_on": "可用于：",
+	"mmorpg.word.usableon": "可用于：",
+
+    "Lock Recipe": "锁定配方",
+    "Start Crafting": "开始合成",
+    "Stop Crafting": "结束合成"
+}
--- a/.minecraft/versions/边境流放/config/quark-common.toml
+++ b/.minecraft/versions/边境流放/config/quark-common.toml
--- a/.minecraft/versions/边境流放/config/spawnermod.json
+++ b/.minecraft/versions/边境流放/config/spawnermod.json
@@ -181,8 +181,13 @@
    "minecraft:zombie_horse": 1,
    "minecraft:zombie_villager": 1,
    "minecraft:zombified_piglin": 1,
-    "touhou_little_maid:fairy": 1,
-    "touhou_little_maid:maid": 1,
+    "quark:crab": 0,
+    "quark:forgotten": 0,
+    "quark:foxhound": 0,
+    "quark:shiba": 0,
+    "quark:stoneling": 0,
+    "quark:toretoise": 0,
+    "quark:wraith": 0,
    "twilightforest:adherent": 1,
    "twilightforest:alpha_yeti": 1,
    "twilightforest:armored_giant": 1,
--- a/.minecraft/versions/边境流放/config/touhou_little_maid-common.toml
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid-common.toml
@@ -1,118 +0,0 @@
-
-[maid]
-	#The item that can tamed maid
-	#Use the registered name of the item directly or write tag name with # as prefix
-	MaidTamedItem = "minecraft:cake"
-	#The item that can temptation maid
-	#Use the registered name of the item directly or write tag name with # as prefix
-	MaidTemptationItem = "minecraft:cake"
-	#The item that can NTR maid
-	#Use the registered name of the item directly or write tag name with # as prefix
-	MaidNtrItem = "minecraft:structure_void"
-	#Maid can switch models freely
-	MaidChangeModel = true
-	#The maximum number of maids the player own
-	#Range: > 0
-	OwnerMaxMaidNum = 2147483647
-	#The entity that the maid will not hurt when in ranged attack
-	MaidRangedAttackIgnore = []
-	#The max range of maid work mode
-	#Range: 3 ~ 64
-	MaidWorkRange = 12
-	#The max range of maid idle mode
-	#Range: 3 ~ 32
-	MaidIdleRange = 6
-	#The max range of maid sleep mode
-	#Range: 3 ~ 32
-	MaidSleepRange = 6
-	#The max range of maid's Non-Home mode
-	#Range: 3 ~ 32
-	MaidNonHomeRange = 8
-	#The max number of animals around when the maid breeds animals
-	#Range: 6 ~ 65536
-	FeedAnimalMaxNumber = 50
-	#Maid can only play gomoku with her owner
-	MaidGomokuOwnerLimit = true
-	#These items cannot be placed in the maid backpack
-	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
-	ChairChangeModel = true
-	#Chair can be destroyed by anyone
-	ChairCanDestroyedByAnyone = true
-
-[misc]
-	#Maid fairy's power point
-	#Range: 0.0 ~ 5.0
-	MaidFairyPowerPoint = 0.16
-	#Maid fairy's spawn probability (zombie is 100, enderman is 10)
-	#Range: > 0
-	MaidFairySpawnProbability = 70
-	#Loss power point after player death
-	#Range: 0.0 ~ 5.0
-	PlayerDeathLossPowerPoint = 1.0
-	#Give a soul spell item for player first join
-	GiveSoulSpell = true
-	#Shrine Lamp Effect Cost (Power Point/Per Hour)
-	#Range: 0.0 ~ 1.7976931348623157E308
-	ShrineLampEffectCost = 0.9
-	#Shrine Lamp Max Storage Power Point
-	#Range: 0.0 ~ 1.7976931348623157E308
-	ShrineLampMaxStorage = 100.0
-	#Shrine Lamp Max Range Of Absorb Power Point
-	#Range: > 0
-	ShrineLampMaxRange = 6
-	#The following dimension do not spawn maid fairy
-	MaidFairyBlacklistDimension = ["minecraft:the_nether", "minecraft:the_end", "twilightforest:twilight_forest"]
-	#Give the Memorizable Gensokyo book item for player first join
-	GivePatchouliBook = true
-	#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.
-	ReplaceSlimeModel = true
-	#Whether to replace the vanilla xp orb texture with the point items.
-	ReplaceXPTexture = true
-	#Whether to replace the vanilla totem texture with the life point.
-	ReplaceTotemTexture = true
-	#Whether to replace the vanilla bottle of xp texture with the point items.
-	ReplaceXPBottleTexture = true
-
--- a/.minecraft/versions/边境流放/config/touhou_little_maid/file/bilanhangxian-1.0.0.zip
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid/file/bilanhangxian-1.0.0.zip
--- a/.minecraft/versions/边境流放/config/touhou_little_maid/file/genshin_impact-1.1.6.zip
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid/file/genshin_impact-1.1.6.zip
--- a/.minecraft/versions/边境流放/config/touhou_little_maid/in_game_maid_config.json
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid/in_game_maid_config.json
@@ -1 +0,0 @@
-{"sound_frequency":0.8057432432432432,"show_chat_bubble":true,"show_backpack":true}
--- a/.minecraft/versions/边境流放/config/touhou_little_maid/info.json
+++ b/.minecraft/versions/边境流放/config/touhou_little_maid/info.json
--- a/.minecraft/versions/边境流放/config/xaerominimap_entities.json
+++ b/.minecraft/versions/边境流放/config/xaerominimap_entities.json
@@ -22,8 +22,8 @@
    "startFadingAt": 0.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 2.0,
-    "heightLimit": 20.0,
    "names": 0.0,
+    "heightLimit": 20.0,
    "iconScale": 1.0
  },
  "subCategories": [
--- a/.minecraft/versions/边境流放/config/zeta-common.toml
+++ b/.minecraft/versions/边境流放/config/zeta-common.toml
@@ -0,0 +1,28 @@
+
+[general]
+	#Disable this to turn off the module system logic that makes features turn off when specified mods with the same content are loaded
+	"Use Anti Overlap" = true
+	#Enable Zeta's piston structure resolver, needed for some Quark or other mod features. If you're having troubles, try turning this off, but be aware other Zeta-using mods can enable it too.
+	"Use Piston Logic Replacement" = true
+	#Changes the piston push limit. Only has an effect if Zeta's piston structure resolver is in use.
+	#Allowed values: (0,)
+	"Piston Push Limit" = 12
+	#Set to false to disable the behavior where Zeta will automatically hide any disabled items from creative and JEI
+	"Hide Disabled Content" = true
+	#Set to false to disable Zeta's item info when viewing recipe/uses for an item in JEI
+	"Enable Jei Item Info" = true
+	#For JEI info purposes, add any items here to specifically disable their JEI info from Zeta. Note that Zeta already only shows info that's relevant to which features are enabled
+	"Suppressed Info" = []
+	#Set to false to stop Zeta from adding mod items to multi-requirement vanilla advancements
+	"Enable Advancement Modification" = true
+	#Set to false to stop Zeta mods from adding their own advancements
+	"Enable Modded Advancements" = true
+	#Set to true to enable a system that debugs Zeta mod worldgen features. This should ONLY be used if you're asked to by a dev.
+	"Enable Worldgen Watchdog" = false
+	#Set to true to make the Zeta big worldgen features generate as spheres rather than unique shapes. It's faster, but won't look as cool
+	"Use Fast Worldgen" = false
+	#Set to true to enable verbose logging of creative tab logic, for debugging purposes
+	"Enable Creative Verbose Logging" = false
+	#Set to true to force all creative tab additions to be added to the end of the creative tabs rather than the middle, as a failsafe
+	"Force Creative Tab Appends" = false
+
--- a/.minecraft/versions/边境流放/defaultconfigs/temporary_spawners-server.toml
+++ b/.minecraft/versions/边境流放/defaultconfigs/temporary_spawners-server.toml
@@ -0,0 +1,10 @@
+
+#Temporary spawner Configs
+[general]
+	enable = true
+	ENABLE_SPAWNER_DESTRUCTION = true
+	#Range: 0 ~ 100000
+	SPAWNER_LIFETIME_MINUTES = 60
+	#Range: 0 ~ 100000
+	SPAWNER_COOLDOWN_MINUTES = 60
+
--- a/.minecraft/versions/边境流放/tlm_custom_pack/touhou_little_maid-1.0.0.zip
+++ b/.minecraft/versions/边境流放/tlm_custom_pack/touhou_little_maid-1.0.0.zip
--- a/.minecraft/versions/边境流放/mods/Temporary-Spawners-1.20.1-1.5.1.jar
+++ b/.minecraft/versions/边境流放/mods/Temporary-Spawners-1.20.1-1.5.1.jar
--- a/.minecraft/versions/边境流放/mods/Zeta-1.0-24.jar
+++ b/.minecraft/versions/边境流放/mods/Zeta-1.0-24.jar
--- a/.minecraft/versions/边境流放/mods/blockui-1.20.1-1.0.186-beta.jar
+++ b/.minecraft/versions/边境流放/mods/blockui-1.20.1-1.0.186-beta.jar
--- a/.minecraft/versions/边境流放/mods/charmofundying-forge-6.5.0+1.20.1.jar
+++ b/.minecraft/versions/边境流放/mods/charmofundying-forge-6.5.0+1.20.1.jar
--- a/.minecraft/versions/边境流放/mods/domum_ornamentum-1.20.1-1.0.282-snapshot-universal.jar
+++ b/.minecraft/versions/边境流放/mods/domum_ornamentum-1.20.1-1.0.282-snapshot-universal.jar
--- a/.minecraft/versions/边境流放/mods/dummmmmmy-1.20-2.0.2.jar
+++ b/.minecraft/versions/边境流放/mods/dummmmmmy-1.20-2.0.2.jar
--- a/.minecraft/versions/边境流放/mods/inventoryhud.forge.1.20.1-3.4.26.jar
+++ b/.minecraft/versions/边境流放/mods/inventoryhud.forge.1.20.1-3.4.26.jar
--- a/.minecraft/versions/边境流放/mods/moonlight-1.20-2.13.41-forge.jar
+++ b/.minecraft/versions/边境流放/mods/moonlight-1.20-2.13.41-forge.jar
--- a/.minecraft/versions/边境流放/mods/storageracks-1.20.1-1.5.jar
+++ b/.minecraft/versions/边境流放/mods/storageracks-1.20.1-1.5.jar
--- a/.minecraft/versions/边境流放/mods/touhoulittlemaid-1.20.1-release-1.1.13.jar
+++ b/.minecraft/versions/边境流放/mods/touhoulittlemaid-1.20.1-release-1.1.13.jar
--- a/.minecraft/versions/边境流放/mods/vaultpatcher-all-1.4.4+1.jar
+++ b/.minecraft/versions/边境流放/mods/vaultpatcher-all-1.4.4+1.jar
--- a/.minecraft/versions/边境流放/mods/vaultpatcher-forge-1.3.1.jar.disabled
+++ b/.minecraft/versions/边境流放/mods/vaultpatcher-forge-1.3.1.jar.disabled
--- a/.minecraft/versions/边境流放/options.txt
+++ b/.minecraft/versions/边境流放/options.txt
@@ -128,7 +128,7 @@ key_key.immersive_aircraft.fallback_control_pull:key.keyboard.unknown
 key_key.immersive_aircraft.fallback_control_push:key.keyboard.unknown
 key_key.immersive_aircraft.fallback_use:key.keyboard.unknown
 key_key.immersive_aircraft.dismount:key.keyboard.r
-key_key.immersive_aircraft.boost:key.keyboard.b
+key_key.immersive_aircraft.boost:key.keyboard.v
 key_gui.xaero_open_map:key.keyboard.m
 key_gui.xaero_open_settings:key.keyboard.right.bracket
 key_gui.xaero_map_zoom_in:key.keyboard.unknown
@@ -140,21 +140,21 @@ key_keybind.sophisticatedbackpacks.open_backpack:key.keyboard.b
 key_keybind.sophisticatedbackpacks.inventory_interaction:key.keyboard.c
 key_keybind.sophisticatedbackpacks.tool_swap:key.keyboard.unknown
 key_keybind.sophisticatedbackpacks.sort:key.mouse.middle
-key_keybind.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT
-key_keybind.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT
-key_keybind.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown
-key_keybind.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown
 key_keybind.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown
+key_keybind.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown
+key_keybind.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown
+key_keybind.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT
+key_keybind.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT
 key_key.carry.desc:key.keyboard.left.shift
 key_equipmentcompare.key.showTooltips:key.keyboard.left.shift
-key_key.corpse.death_history:key.keyboard.u
+key_key.corpse.death_history:key.keyboard.unknown
 key_key.cataclysm.ability:key.keyboard.x
 key_key.cataclysm.helmet_ability:key.keyboard.c
 key_key.cataclysm.chestplate_ability:key.keyboard.y
 key_key.cataclysm.boots_ability:key.keyboard.v
-key_key.curios.open.desc:key.keyboard.g
+key_key.curios.open.desc:key.keyboard.unknown
 key_iris.keybind.reload:key.keyboard.unknown
-key_iris.keybind.toggleShaders:key.keyboard.k
+key_iris.keybind.toggleShaders:key.keyboard.unknown
 key_iris.keybind.shaderPackSelection:key.keyboard.o
 key_key.ftbultimine:key.keyboard.grave.accent
 key_key.ftbteams.open_gui:key.keyboard.unknown
@@ -177,6 +177,9 @@ key_spell_5:key.keyboard.r:SHIFT
 key_spell_6:key.keyboard.v:SHIFT
 key_spell_7:key.keyboard.c:SHIFT
 key_spell_8:key.keyboard.g:SHIFT
+key_key.lightmanscurrency.open_wallet:key.keyboard.j
+key_key.lightmanscurrency.portable_terminal:key.keyboard.backslash
+key_key.lightmanscurrency.portable_atm:key.keyboard.equal
 key_keybinds.bettercombat.feint:key.keyboard.unknown
 key_keybinds.bettercombat.toggle_mine_with_weapons:key.keyboard.unknown
 key_key.jade.config:key.keyboard.keypad.0
@@ -197,7 +200,7 @@ key_gui.xaero_enlarge_map:key.keyboard.z
 key_gui.xaero_waypoints_key:key.keyboard.u
 key_gui.xaero_zoom_in:key.keyboard.unknown
 key_gui.xaero_zoom_out:key.keyboard.unknown
-key_gui.xaero_new_waypoint:key.keyboard.b
+key_gui.xaero_new_waypoint:key.keyboard.unknown
 key_gui.xaero_display_all_sets:key.keyboard.unknown
 key_gui.xaero_toggle_light_overlay:key.keyboard.unknown
 key_gui.xaero_toggle_entity_radar:key.keyboard.unknown
@@ -210,11 +213,47 @@ key_gui.xaero_toggle_pac_chunk_claims:key.keyboard.unknown
 key_gui.xaero_minimap_settings:key.keyboard.y
 key_keys.armourers_workshop.open-wardrobe:key.keyboard.p:CONTROL
 key_keys.armourers_workshop.undo:key.keyboard.z:CONTROL
+key_key.inventoryhud.toggle:key.keyboard.i
+key_key.inventoryhud.openconfig:key.keyboard.unknown
+key_key.inventoryhud.togglepot:key.keyboard.unknown
+key_key.inventoryhud.togglearm:key.keyboard.unknown
+key_key.inventoryhud.toggleall:key.keyboard.unknown
+key_quark.keybind.autorun:key.keyboard.n
+key_quark.keybind.back:key.mouse.4
+key_quark.keybind.camera_mode:key.keyboard.f12
+key_quark.keybind.transfer_insert:key.keyboard.unknown
+key_quark.keybind.transfer_extract:key.keyboard.unknown
+key_quark.keybind.shift_lock:key.keyboard.unknown
+key_quark.emote.no:key.keyboard.unknown
+key_quark.emote.yes:key.keyboard.unknown
+key_quark.emote.wave:key.keyboard.unknown
+key_quark.emote.salute:key.keyboard.unknown
+key_quark.emote.cheer:key.keyboard.unknown
+key_quark.emote.clap:key.keyboard.unknown
+key_quark.emote.think:key.keyboard.unknown
+key_quark.emote.point:key.keyboard.unknown
+key_quark.emote.shrug:key.keyboard.unknown
+key_quark.emote.headbang:key.keyboard.unknown
+key_quark.emote.weep:key.keyboard.unknown
+key_quark.emote.facepalm:key.keyboard.unknown
+key_quark.keybind.patreon_emote.dance:key.keyboard.unknown
+key_quark.keybind.patreon_emote.tpose:key.keyboard.unknown
+key_quark.keybind.patreon_emote.dab:key.keyboard.unknown
+key_quark.keybind.patreon_emote.jet:key.keyboard.unknown
+key_quark.keybind.patreon_emote.exorcist:key.keyboard.unknown
+key_quark.keybind.patreon_emote.zombie:key.keyboard.unknown
+key_quark.keybind.change_hotbar:key.keyboard.unknown
+key_quark.keybind.sort_player:key.keyboard.unknown
+key_quark.keybind.sort_container:key.keyboard.unknown
+key_quark.keybind.lock_rotation:key.keyboard.unknown
+key_quark.keybind.narrator_readout:key.keyboard.unknown
+key_quark.keybind.narrator_full_readout:key.keyboard.unknown
+key_quark.keybind.variant_selector:key.keyboard.r
 key_key.modernui.openCenter:key.keyboard.k:CONTROL
-key_key.modernui.zoom:key.keyboard.z
+key_key.modernui.zoom:key.keyboard.c
 key_key.firstperson.toggle:key.keyboard.f6
 key_key.entityculling.toggle:key.keyboard.unknown
-soundCategory_master:0.8087748344370861
+soundCategory_master:1.0
 soundCategory_music:0.0
 soundCategory_record:1.0
 soundCategory_weather:1.0
--- a/.minecraft/versions/边境流放/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip
+++ b/.minecraft/versions/边境流放/resourcepacks/Minecraft-Mod-Language-Modpack-Converted-1.20.1.zip
--- a/.minecraft/versions/边境流放/resourcepacks/Quark
+++ b/.minecraft/versions/边境流放/resourcepacks/Quark
--- a/.minecraft/versions/边境流放/tlm_custom_pack/bilanhangxian-1.0.0.zip
+++ b/.minecraft/versions/边境流放/tlm_custom_pack/bilanhangxian-1.0.0.zip
--- a/.minecraft/versions/边境流放/tlm_custom_pack/genshin_impact-1.1.6.zip
+++ b/.minecraft/versions/边境流放/tlm_custom_pack/genshin_impact-1.1.6.zip
--- a/README.md
+++ b/README.md
@@ -39,7 +39,6 @@ a测使用正式版的小数后加alpha作为版本号，如`0.1-alpha`
 - [x] [凡家物语：重生 MCA Reborn](https://www.mcmod.cn/class/5099.html)
 - [x] [挖矿与砍杀 Mine and Slash](https://www.mcmod.cn/class/1998.html)
 - [x] [暮色森林 The Twilight Forest](https://www.mcmod.cn/class/61.html)
- [x] [车万女仆 Touhou Little Maid](https://www.mcmod.cn/class/1796.html)
 - [x] [旷野之息高塔：再重制 Towers of the Wild Modded](https://www.mcmod.cn/class/11568.html)
 - [x] [地牢浮现之时 When Dungeons Arise](https://www.mcmod.cn/class/3607.html)
 - [x] [YUNG的地牢优化 YUNG's Better Dungeons](https://www.mcmod.cn/class/4429.html)
@@ -62,9 +61,11 @@ a测使用正式版的小数后加alpha作为版本号，如`0.1-alpha`
 - [x] [真实的钓鱼 Fishing Real](https://www.mcmod.cn/class/2883.html)
 - [x] [沉浸式飞机 Immersive Aircraft](https://www.mcmod.cn/class/8527.html)
 - [x] [只是更多的蛋糕！ Just More Cakes!](https://www.mcmod.cn/class/5013.html) [^1]
+- [ ] [Lightmans Currency](https://www.mcmod.cn/class/5435.html) [^2]
 - [x] [Lootr](https://www.mcmod.cn/class/2924.html)
 - [x] [玩家救援 PlayerRevive](https://www.mcmod.cn/class/1914.html)
 - [x] [结构变体 Repurposed Structures](https://www.mcmod.cn/class/4518.html)
+- [x] [Storage Racks](https://www.mcmod.cn/class/5247.html)
 - [x] [传送石碑/指路石 Waystones](https://www.mcmod.cn/class/1339.html)
  - [x] [Xaero's Minimap & World Map - Waystones Compability](https://www.mcmod.cn/class/11304.html)
 - [x] [精妙背包 Sophisticated Backpacks](https://www.mcmod.cn/class/3739.html)
@@ -84,17 +85,20 @@ a测使用正式版的小数后加alpha作为版本号，如`0.1-alpha`
 - [x] [帕秋莉手册 Patchouli](https://www.mcmod.cn/class/1388.html)
 - [x] [多态合成 Polymorph](https://www.mcmod.cn/class/2895.html)
 - [x] [灵魂绑定 SoulBound](https://www.mcmod.cn/class/11151.html)
+- [x] [Temporary Spawners](https://www.mcmod.cn/class/9038.html)
 - [x] [火炬大师 Torchmaster](https://www.mcmod.cn/class/779.html)
 ### 前置mod
 - [x] [ArchitecturyAPI](https://www.mcmod.cn/class/3434.html)
 - [x] [Auudio](https://www.mcmod.cn/class/7489.html)
 - [x] [Balm](https://www.mcmod.cn/class/4485.html)
+- [x] [BlockUI](https://www.mcmod.cn/class/5246.html)
 - [x] [Bookshelf](https://www.mcmod.cn/class/938.html)
 - [x] [Citadel](https://www.mcmod.cn/class/2232.html)
 - [x] [Cloth Config API](https://www.mcmod.cn/class/2346.html)
 - [x] [Common Network](https://www.mcmod.cn/class/15071.html)
 - [x] [CreativeCore](https://www.mcmod.cn/class/1283.html)
 - [x] [Curios API](https://www.mcmod.cn/class/2029.html)
+- [x] [Domum Ornamentum](https://www.mcmod.cn/class/5506.html)
 - [x] [GeckoLib](https://www.mcmod.cn/class/3232.html)
 - [x] [冰山 Iceberg](https://www.mcmod.cn/class/5074.html)
 - [x] [物品过滤器 Item Filters](https://www.mcmod.cn/class/1605.html)
@@ -127,7 +131,6 @@ a测使用正式版的小数后加alpha作为版本号，如`0.1-alpha`
 - [x] [玉 🔍 Jade 🔍](https://www.mcmod.cn/class/3482.html)
  - [x] [Jade Addons](https://www.mcmod.cn/class/5837.html)
 - [x] [通用拼音搜索 Just Enough Characters](https://www.mcmod.cn/class/840.html)
- [x] [Just Zoom](https://www.mcmod.cn/class/5701.html)
 - [x] [自定义局域网联机 Lan Server Properties](https://www.mcmod.cn/class/2754.html)
 - [x] [传说工具提示 Legendary Tooltips](https://www.mcmod.cn/class/5396.html)
 - [x] [鼠标手势 Mouse Tweaks](https://www.mcmod.cn/class/1162.html)
@@ -154,6 +157,7 @@ a测使用正式版的小数后加alpha作为版本号，如`0.1-alpha`
 - [x] [Noisium](https://www.mcmod.cn/class/12724.html)

 [^1]:由于客户端使用NeoForge，这些Mod正常情况下均无法加载（Forge版本过低），因此对Mod进行了一些修改。修改后的Mod经测试可以正常加载，但是不确保会因此出现bug。
+[^2]:将在未来的某个版本正式实装，目前客户端内仅保留相关配置文件。

 ## 推荐安装的mod
 - [自动翻译 AutoTranslation](https://www.mcmod.cn/class/12385.html)
Author	SHA1	Message	Date
ddaodan	be15a0d1cf	0.0.11-alpha	2024-12-22 20:40:49 +08:00
ddaodan	63f5df32f5	0.0.10-alpha	2024-12-18 21:20:10 +08:00
				`@@ -0,0 +1 @@`
				{"ring_2":{"x":151,"y":93,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"feet":{"x":31,"y":19,"enabled":false,"halign":"LEFT","valign":"TOP"},"wallet":{"x":195,"y":110,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"hands":{"x":195,"y":93,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"belt":{"x":195,"y":59,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"ring":{"x":151,"y":76,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"back":{"x":151,"y":110,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"bracelet":{"x":0,"y":85,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"necklace":{"x":151,"y":59,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"body":{"x":0,"y":68,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":0,"y":51,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"head":{"x":195,"y":42,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"omen":{"x":151,"y":42,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"},"charm":{"x":1,"y":54,"enabled":true,"halign":"MIDDLE","valign":"BOTTOM"},"hands_2":{"x":195,"y":76,"enabled":true,"halign":"RIGHT","valign":"BOTTOM"}}
				`@@ -1 +0,0 @@`
				`{"sound_frequency":0.8057432432432432,"show_chat_bubble":true,"show_backpack":true}`