Update .gitignore to include new datapack directories, remove outdated global_data_pack, and refine options.txt to reset resource and incompatible resource packs. Enhance JEI ingredient list with new entries for improved organization.

This commit is contained in:
Leonid Pershin
2026-05-09 13:58:47 +03:00
parent 4448096dbf
commit 5f8358488f
7 changed files with 15 additions and 12 deletions
+7 -2
View File
@@ -23,6 +23,7 @@
!/mods/** !/mods/**
!/resourcepacks/** !/resourcepacks/**
!/shaderpacks/** !/shaderpacks/**
!/datapacks/**
# --- Сервер --- # --- Сервер ---
!/Server/ !/Server/
@@ -48,8 +49,12 @@
!/Server/config/** !/Server/config/**
!/Server/kubejs/** !/Server/kubejs/**
!/Server/mods/** !/Server/mods/**
!/Server/global_data_pack/** !/Server/global_packs/
!/Server/global_packs/**
!/Server/global_packs/required_data/**
!/Server/global_packs/required_resources/**
!/Server/global_packs/optional_data/**
!/Server/global_packs/optional_resources/**
# сервер: реальный server.properties локальный; эталон в server.properties.example # сервер: реальный server.properties локальный; эталон в server.properties.example
/Server/server.properties /Server/server.properties
-1
View File
@@ -1 +0,0 @@
@@ -127,3 +127,4 @@ Create: Totem Factory
Sauce Delight Sauce Delight
Some Assembly Required Some Assembly Required
create: things and misc create: things and misc
Trash Cans
File diff suppressed because one or more lines are too long
+5 -7
View File
@@ -48,8 +48,8 @@ mouseSensitivity:0.5
damageTiltStrength:1.0 damageTiltStrength:1.0
highContrast:false highContrast:false
narratorHotkey:true narratorHotkey:true
resourcePacks:["vanilla","fabric","mod_resources","moonlight:merged_pack","file/FreshAnimations_v1.10.4.zip","vanillabackport:freshly_animated","file/TerralithBiomesNames.zip","file/loadingbackgrounds_default_images-1.21.X-4.0.0.zip","file/PupaMLupa-Translations"] resourcePacks:[]
incompatibleResourcePacks:["file/TerralithBiomesNames.zip"] incompatibleResourcePacks:[]
lastServer: lastServer:
lang:ru_ru lang:ru_ru
chatVisibility:0 chatVisibility:0
@@ -153,7 +153,7 @@ key_quark.keybind.patreon_emote.jet:key.keyboard.unknown
key_quark.keybind.patreon_emote.exorcist:key.keyboard.unknown key_quark.keybind.patreon_emote.exorcist:key.keyboard.unknown
key_quark.keybind.patreon_emote.zombie:key.keyboard.unknown key_quark.keybind.patreon_emote.zombie:key.keyboard.unknown
key_quark.keybind.change_hotbar:key.keyboard.z key_quark.keybind.change_hotbar:key.keyboard.z
key_quark.keybind.sort_player:key.keyboard.unknown key_quark.keybind.sort_player:key.mouse.middle
key_quark.keybind.sort_container:key.mouse.middle key_quark.keybind.sort_container:key.mouse.middle
key_quark.keybind.lock_rotation:key.keyboard.k key_quark.keybind.lock_rotation:key.keyboard.k
key_quark.keybind.narrator_readout:key.keyboard.unknown key_quark.keybind.narrator_readout:key.keyboard.unknown
@@ -245,12 +245,11 @@ key_simulated.keyinfo.scroll_down:key.keyboard.unknown
key_key.sophisticatedbackpacks.open_backpack:key.keyboard.b key_key.sophisticatedbackpacks.open_backpack:key.keyboard.b
key_key.sophisticatedbackpacks.inventory_interaction:key.keyboard.c key_key.sophisticatedbackpacks.inventory_interaction:key.keyboard.c
key_key.sophisticatedbackpacks.tool_swap:key.keyboard.unknown key_key.sophisticatedbackpacks.tool_swap:key.keyboard.unknown
key_key.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown
key_key.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown
key_key.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown key_key.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown
key_key.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT key_key.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT
key_key.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT key_key.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT
key_key.carry.desc:key.keyboard.unknown key_key.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown
key_key.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown
key_key.cataclysm.ability:key.keyboard.v key_key.cataclysm.ability:key.keyboard.v
key_key.cataclysm.helmet_ability:key.keyboard.c key_key.cataclysm.helmet_ability:key.keyboard.c
key_key.cataclysm.chestplate_ability:key.keyboard.y key_key.cataclysm.chestplate_ability:key.keyboard.y
@@ -310,7 +309,6 @@ key_key.parcool.openSetting:key.keyboard.p:ALT
key_key.parcool.QuickTurn:key.keyboard.unknown key_key.parcool.QuickTurn:key.keyboard.unknown
key_key.parcool.Flipping:key.keyboard.unknown key_key.parcool.Flipping:key.keyboard.unknown
key_key.parcool.HangDown:key.mouse.right key_key.parcool.HangDown:key.mouse.right
key_key.pickup.item:key.keyboard.unknown
key_key.entityculling.toggle:key.keyboard.unknown key_key.entityculling.toggle:key.keyboard.unknown
soundCategory_master:0.30690889565061746 soundCategory_master:0.30690889565061746
soundCategory_music:0.10635706128663873 soundCategory_music:0.10635706128663873