diff --git a/Server/mods/carryon-neoforge-1.21.1-2.2.4.4.jar b/Server/mods/carryon-neoforge-1.21.1-2.2.4.4.jar deleted file mode 100644 index 5159f06..0000000 Binary files a/Server/mods/carryon-neoforge-1.21.1-2.2.4.4.jar and /dev/null differ diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 6d0785b..14487da 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -112,3 +112,18 @@ Witcher Wizards (RPG Series) Better Archeology Create Tracks +Create Aquatic Ambitions +Create Bits 'n' Bobs +Create Cafe +Create Chocolate Fountain +Create Railways Navigator +Create Train Parts +Create: Bells & Whistles +Create: Blaze Burner Fuels +Create: Deep Dark +Create: Mobile Packages +Create: Power Grid +Create: Totem Factory +Sauce Delight +Some Assembly Required +create: things and misc diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index a9cdabf..a898c94 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -99,3 +99,8 @@ mynethersdelight:forgoting rechiseled:chiseling sliceanddice:slicer betterarcheology:identifying +create_aquatic_ambitions:channeling +powergrid:circuit_assembly +powergrid:circuit_design +powergrid:magnetizing +someassemblyrequired:sandwiching_station diff --git a/config/jei/world/server/TailServer_66b67433/lookupHistory.json b/config/jei/world/server/TailServer_66b67433/lookupHistory.json new file mode 100644 index 0000000..a3b33ae --- /dev/null +++ b/config/jei/world/server/TailServer_66b67433/lookupHistory.json @@ -0,0 +1,5 @@ +[ + {"version":1}, + {"ingredient":{"id":"minecraft:oak_planks"},"type":"item_stack","bookmarkType":"INGREDIENT"}, + {"ingredient":{"id":"aquaculture:driftwood"},"type":"item_stack","bookmarkType":"INGREDIENT"} +] \ No newline at end of file diff --git a/config/xaero/minimap/profiles/default.cfg b/config/xaero/minimap/profiles/default.cfg index 086a959..787bc18 100644 --- a/config/xaero/minimap/profiles/default.cfg +++ b/config/xaero/minimap/profiles/default.cfg @@ -8,6 +8,7 @@ display_minimap = true minimap_item = - minimap_safe_mode = false minimap_ui_scale = 1 +entity_radar_categories = This option's value is saved to sub-folder "entity_radar_categories". display_radar = true radar_dots_style = 0 radar_smooth_dots = true @@ -81,7 +82,7 @@ minimap_display_stained_glass = true minimap_adjust_height_for_short_blocks = true minimap_anti_aliasing = true minimap_size = 0 -minimap_shape = 0 +minimap_shape = 1 minimap_north_locked = false minimap_zoom = 1 minimap_cave_mode_extra_zoom = 2 @@ -91,7 +92,7 @@ keep_enlarged_minimap_unlocked = false minimap_toggled_enlarged = false minimap_lighting = true minimap_opacity = 100 -minimap_frame = 0 +minimap_frame = 2 minimap_frame_color = 9 hide_minimap_under_screen = true hide_minimap_under_f3 = true diff --git a/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json b/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json new file mode 100644 index 0000000..d7187d2 --- /dev/null +++ b/config/xaero/minimap/profiles/entity_radar_categories/default.cfg.json @@ -0,0 +1,191 @@ +{ + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:glow_item_frame", + "minecraft:item_frame" + ], + "name": "gui.xaero_entity_category_root", + "protection": true, + "settingOverrides": { + "displayHeight": 0.0, + "displayed": true, + "heightBasedFade": true, + "renderOrder": 0.0, + "color": 13.0, + "displayNameWhenIconFails": true, + "entityNumber": 1000.0, + "alwaysDisplayNametags": false, + "startFadingAt": 0.0, + "dotSize": 2.0, + "renderOverMinimapFrame": 1.0, + "icons": 1.0, + "names": 0.0, + "heightLimit": 20.0, + "iconScale": 1.0 + }, + "subCategories": [ + { + "hardInclude": "living", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:armor_stand" + ], + "name": "gui.xaero_entity_category_living", + "protection": true, + "settingOverrides": { + "renderOrder": 2.0, + "color": 14.0 + }, + "subCategories": [ + { + "hardInclude": "players", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_players", + "protection": true, + "settingOverrides": { + "renderOrder": 6.0, + "heightLimit": 2050.0, + "color": 15.0 + }, + "subCategories": [ + { + "hardInclude": "nothing", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friend", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "tracked", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_tracked", + "protection": true, + "settingOverrides": { + "icons": 2.0 + }, + "subCategories": [] + }, + { + "hardInclude": "same-team", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_same_team", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_teams", + "protection": true, + "settingOverrides": { + "renderOrder": 7.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "hostile", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile", + "protection": true, + "settingOverrides": { + "renderOrder": 3.0 + }, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 5.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly", + "protection": true, + "settingOverrides": {}, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 4.0 + }, + "subCategories": [] + } + ] + } + ] + }, + { + "hardInclude": "items", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_items", + "protection": true, + "settingOverrides": { + "renderOrder": 1.0, + "color": 12.0 + }, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_entities", + "protection": true, + "settingOverrides": { + "color": 5.0 + }, + "subCategories": [] + } + ] +} \ No newline at end of file diff --git a/config/xaerohud.txt b/config/xaerohud.txt index 6e08e42..34e6e60 100644 --- a/config/xaerohud.txt +++ b/config/xaerohud.txt @@ -1 +1 @@ -module;id=xaerominimap:minimap;x=0;y=0;centered=false;fromRight=false;fromBottom=false;flippedVer=false;flippedHor=false; +module;id=xaerominimap:minimap;x=-7;y=-3;centered=false;fromRight=true;fromBottom=false;flippedVer=false;flippedHor=false; diff --git a/mods/carryon-neoforge-1.21.1-2.2.4.4.jar b/mods/carryon-neoforge-1.21.1-2.2.4.4.jar deleted file mode 100644 index 5159f06..0000000 Binary files a/mods/carryon-neoforge-1.21.1-2.2.4.4.jar and /dev/null differ diff --git a/options.txt b/options.txt index 0f8b109..f649833 100644 --- a/options.txt +++ b/options.txt @@ -225,6 +225,8 @@ key_gui.xaero_toggle_pac_chunk_claims:key.keyboard.unknown key_key.aether.open_accessories.desc:key.keyboard.i key_key.aether.gravitite_jump_ability.desc:key.keyboard.space key_key.aether.invisibility_toggle.desc:key.keyboard.v +key_create_mobile_packages.keyinfo.open_portable_stock_ticker:key.keyboard.g +key_create_mobile_packages.keyinfo.open_player_networks_screen:key.keyboard.h key_key.sophisticatedcore.sort:key.mouse.middle key_key.sophisticatedcore.transfer_to_storage:key.keyboard.left.bracket key_key.sophisticatedcore.transfer_to_inventory:key.keyboard.right.bracket @@ -237,24 +239,22 @@ key_gui.xaero_quick_confirm:key.keyboard.right.shift key_gui.xaero_toggle_dimension:key.keyboard.unknown key_placebo.toggleTrails:key.keyboard.keypad.9 key_placebo.toggleWings:key.keyboard.keypad.8 -key_key.sophisticatedbackpacks.open_backpack:key.keyboard.b -key_key.sophisticatedbackpacks.inventory_interaction:key.keyboard.c -key_key.sophisticatedbackpacks.tool_swap:key.keyboard.unknown -key_key.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown -key_key.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown -key_key.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown -key_key.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT -key_key.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT key_simulated.keyinfo.rotate_mode:key.keyboard.tab key_simulated.keyinfo.scroll_up:key.keyboard.unknown key_simulated.keyinfo.scroll_down:key.keyboard.unknown +key_key.sophisticatedbackpacks.open_backpack:key.keyboard.b +key_key.sophisticatedbackpacks.inventory_interaction:key.keyboard.c +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_1:key.keyboard.z:ALT +key_key.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT key_key.carry.desc:key.keyboard.unknown key_key.cataclysm.ability:key.keyboard.v 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.simplytooltips.cycle_tab:key.keyboard.g -key_key.simplytooltips.capture_gif:key.keyboard.h key_key.kubejs.kubedex:key.keyboard.k key_keyinfo.copycats.fill_copycat:key.keyboard.left.alt key_create.keyinfo.toolmenu:key.keyboard.left.alt @@ -277,6 +277,13 @@ key_keybindings.spell_engine.spell_hotbar_7:key.keyboard.unknown key_keybindings.spell_engine.spell_hotbar_8:key.keyboard.unknown key_keybindings.spell_engine.spell_hotbar_9:key.keyboard.unknown key_key.special_ability:key.keyboard.g +key_key.simplytooltips.cycle_tab:key.keyboard.g +key_key.simplytooltips.capture_gif:key.keyboard.h +key_powergrid.keyinfo.rotate_component:key.keyboard.r +key_powergrid.keyinfo.place_trace:key.keyboard.t +key_powergrid.keyinfo.delete_area:key.keyboard.d +key_powergrid.keyinfo.pick_component:key.keyboard.s +key_powergrid.keyinfo.switch_layer:key.keyboard.x key_key.jade.config:key.keyboard.keypad.0 key_key.jade.show_overlay:key.keyboard.keypad.1 key_key.jade.toggle_liquid:key.keyboard.keypad.2 diff --git a/shaderpacks/ComplementaryReimagined_r5.7.1 + EuphoriaPatches_1.8.6.txt b/shaderpacks/ComplementaryReimagined_r5.7.1 + EuphoriaPatches_1.8.6.txt new file mode 100644 index 0000000..65d9ca5 --- /dev/null +++ b/shaderpacks/ComplementaryReimagined_r5.7.1 + EuphoriaPatches_1.8.6.txt @@ -0,0 +1,6 @@ +#Fri May 08 23:18:24 MSK 2026 +BLOCK_REFLECT_QUALITY=1 +ENTITY_SHADOW=-1 +LIGHTSHAFT_QUALI_DEFINE=1 +SHADOW_QUALITY=1 +shadowDistance=128.0