diff --git a/.gitignore b/.gitignore index bd2c27b..dda6667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ saves/ Server/world/ +Server/logs/ +Server/eula.txt +options.txt +logs/ diff --git a/.mixin.out/class/net/irisshaders/iris/gui/screen/ShaderPackScreen.class b/.mixin.out/class/net/irisshaders/iris/gui/screen/ShaderPackScreen.class index fc9b56b..4db4834 100644 Binary files a/.mixin.out/class/net/irisshaders/iris/gui/screen/ShaderPackScreen.class and b/.mixin.out/class/net/irisshaders/iris/gui/screen/ShaderPackScreen.class differ diff --git a/.mixin.out/class/net/minecraft/nbt/CompoundTag.class b/.mixin.out/class/net/minecraft/nbt/CompoundTag.class index 5a90fab..26167a2 100644 Binary files a/.mixin.out/class/net/minecraft/nbt/CompoundTag.class and b/.mixin.out/class/net/minecraft/nbt/CompoundTag.class differ diff --git a/Server/.mixin.out/class/net/minecraft/nbt/CompoundTag.class b/Server/.mixin.out/class/net/minecraft/nbt/CompoundTag.class new file mode 100644 index 0000000..24b8483 Binary files /dev/null and b/Server/.mixin.out/class/net/minecraft/nbt/CompoundTag.class differ diff --git a/Server/config/modernfix-mixins.properties b/Server/config/modernfix-mixins.properties index 8d3b0d2..89c3b81 100644 --- a/Server/config/modernfix-mixins.properties +++ b/Server/config/modernfix-mixins.properties @@ -10,7 +10,7 @@ # Do not include the #. You may reset to defaults by deleting this file. # # Available options: -# mixin.bugfix.chunk_deadlock=false # (overridden for mod compat) +# mixin.bugfix.chunk_deadlock=true # (default) # mixin.bugfix.cofh_core_crash=true # (default) # mixin.bugfix.concurrency=true # (default) # mixin.bugfix.ctm_resourceutil_cme=true # (default) @@ -20,7 +20,7 @@ # mixin.bugfix.fix_config_crashes=true # (default) # mixin.bugfix.missing_block_entities=false # (default) # mixin.bugfix.packet_leak=false # (default) -# mixin.bugfix.paper_chunk_patches=false # (overridden for mod compat) +# mixin.bugfix.paper_chunk_patches=true # (default) # mixin.bugfix.recipe_book_type_desync=true # (default) # mixin.bugfix.restore_old_dragon_movement=false # (default) # mixin.bugfix.skip_redundant_saves=false # (default) @@ -50,7 +50,7 @@ # mixin.perf.attribute_supplier_dedup=true # (default) # mixin.perf.cache_blockstate_cache_arrays=true # (default) # mixin.perf.cache_profile_texture_url=true # (default) -# mixin.perf.cache_strongholds=false # (overridden for mod compat) +# mixin.perf.cache_strongholds=true # (default) # mixin.perf.capability_list_compaction=true # (default) # mixin.perf.chunk_meshing=true # (default) # mixin.perf.clear_mixin_classinfo=false # (default) @@ -86,7 +86,7 @@ # mixin.perf.optimize_surface_rules=true # (default) # mixin.perf.patchouli_deduplicate_books=true # (default) # mixin.perf.reduce_blockstate_cache_rebuilds=true # (default) -# mixin.perf.release_protochunks=false # (overridden for mod compat) +# mixin.perf.release_protochunks=true # (default) # mixin.perf.remove_biome_temperature_cache=true # (default) # mixin.perf.resourcepacks=true # (default) # mixin.perf.smart_ingredient_sync=true # (default) diff --git a/Server/configureddefaults/README.md b/Server/configureddefaults/README.md new file mode 100644 index 0000000..5ca012d --- /dev/null +++ b/Server/configureddefaults/README.md @@ -0,0 +1,12 @@ +# Configured Defaults + +This whole directory servers as a synchronized mirror of `.minecraft`. Every sub-directory and / or file placed within will be copied to the main `.minecraft` directory during game launch if the directory / file is not already present. +There is no way of overriding an existing file, a copy will only be made when the target destination is empty. + +Please note that due to the way Minecraft handles `options.txt` specifically it is sufficient to include only the options you want to set a preset for. All missing options will be filled in using their internal defaults when the file is read by the game. + +Examples: +- `.minecraft/configureddefaults/options.txt` will be copied to `.minecraft/options.txt` if not already present +- `.minecraft/configureddefaults/config/jei/jei.toml` will be copied to `.minecraft/config/jei/jei.toml` if not already present + +Note that this `README.md` file is excluded from being copied to `.minecraft`. diff --git a/Server/crash-reports/crash-2026-05-07_22.56.10-fml.txt b/Server/crash-reports/crash-2026-05-07_22.56.10-fml.txt new file mode 100644 index 0000000..d9f099e --- /dev/null +++ b/Server/crash-reports/crash-2026-05-07_22.56.10-fml.txt @@ -0,0 +1,96 @@ +---- Minecraft Crash Report ---- +// Why did you do that? + +Time: 2026-05-07 22:56:10 +Description: Mod loading failures have occurred; consult the issue messages for more details + +net.neoforged.neoforge.logging.CrashReportExtender$ModLoadingCrashException: Mod loading has failed + + +A detailed walkthrough of the error, its code path and all known details is as follows: +--------------------------------------------------------------------------------------- + +-- Mod loading issue for: colorwheel -- +Details: + Mod file: /C:/Users/mrleo1nid/curseforge/minecraft/Instances/Reimagined/Server/mods/colorwheel-neoforge-1.2.4+mc1.21.1.jar + Failure message: Mod colorwheel requires iris 1.8.0 or above + Currently, iris is not installed + + Mod version: 1.2.4+mc1.21.1 + Mod issues URL: https://github.com/djefrey/Colorwheel/issues + Exception message: + +-- Mod loading issue for: flerovium -- +Details: + Mod file: /C:/Users/mrleo1nid/curseforge/minecraft/Instances/Reimagined/Server/mods/flerovium-neoforge-1.21.1-1.0.18-all.jar + Failure message: Mod flerovium requires sodium 0.6.9 or above + Currently, sodium is not installed + + Mod version: 1.0.18 + Mod issues URL: + Exception message: + +-- System Details -- +Details: + Minecraft Version: 1.21.1 + Minecraft Version ID: 1.21.1 + Operating System: Windows 11 (amd64) version 10.0 + Java Version: 21.0.8, Eclipse Adoptium + Java VM Version: OpenJDK 64-Bit Server VM (mixed mode, sharing), Eclipse Adoptium + Memory: 212552472 bytes (202 MiB) / 780140544 bytes (744 MiB) up to 8573157376 bytes (8176 MiB) + CPUs: 12 + Processor Vendor: AuthenticAMD + Processor Name: AMD Ryzen 5 5600X 6-Core Processor + Identifier: AuthenticAMD Family 25 Model 33 Stepping 0 + Microarchitecture: Zen 3 + Frequency (GHz): 3.69 + Number of physical packages: 1 + Number of physical CPUs: 6 + Number of logical CPUs: 12 + Graphics card #0 name: NVIDIA GeForce RTX 3060 + Graphics card #0 vendor: NVIDIA + Graphics card #0 VRAM (MiB): 12288.00 + Graphics card #0 deviceId: VideoController1 + Graphics card #0 versionInfo: 32.0.15.9636 + Memory slot #0 capacity (MiB): 8192.00 + Memory slot #0 clockSpeed (GHz): 3.20 + Memory slot #0 type: DDR4 + Memory slot #1 capacity (MiB): 8192.00 + Memory slot #1 clockSpeed (GHz): 3.20 + Memory slot #1 type: DDR4 + Memory slot #2 capacity (MiB): 8192.00 + Memory slot #2 clockSpeed (GHz): 3.20 + Memory slot #2 type: DDR4 + Memory slot #3 capacity (MiB): 8192.00 + Memory slot #3 clockSpeed (GHz): 3.20 + Memory slot #3 type: DDR4 + Virtual memory max (MiB): 51123.16 + Virtual memory used (MiB): 45168.41 + Swap memory total (MiB): 18428.44 + Swap memory used (MiB): 1696.88 + Space in storage for jna.tmpdir (MiB): + Space in storage for org.lwjgl.system.SharedLibraryExtractPath (MiB): + Space in storage for io.netty.native.workdir (MiB): + Space in storage for java.io.tmpdir (MiB): available: 16986.62, total: 487582.00 + Space in storage for workdir (MiB): available: 16986.62, total: 487582.00 + JVM Flags: 0 total; + ModLauncher: 11.0.5+main.901c6ea8 + ModLauncher launch target: forgeserver + ModLauncher services: + sponge-mixin-0.15.2+mixin.0.8.7.jar mixin PLUGINSERVICE + loader-4.0.42.jar slf4jfixer PLUGINSERVICE + loader-4.0.42.jar runtime_enum_extender PLUGINSERVICE + at-modlauncher-10.0.1.jar accesstransformer PLUGINSERVICE + loader-4.0.42.jar runtimedistcleaner PLUGINSERVICE + modlauncher-11.0.5.jar mixin TRANSFORMATIONSERVICE + modlauncher-11.0.5.jar fml TRANSFORMATIONSERVICE + modlauncher-11.0.5.jar connector_loader TRANSFORMATIONSERVICE + FML Language Providers: + kotlinforforge@5.11.0 + Configured Defaults@21.1.3 + javafml@4.0 + lowcodefml@4.0 + minecraft@4.0 + Mod List: + server-1.21.1-20240808.144430-srg.jar |Minecraft |minecraft |1.21.1 |Manifest: NOSIGNATURE + neoforge-21.1.228-universal.jar |NeoForge |neoforge |21.1.228 |Manifest: NOSIGNATURE \ No newline at end of file diff --git a/Server/local/crash_assistant/mod_data_cache_v3/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar.mod_data.json b/Server/local/crash_assistant/mod_data_cache_v3/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar.mod_data.json new file mode 100644 index 0000000..26530e0 --- /dev/null +++ b/Server/local/crash_assistant/mod_data_cache_v3/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar.mod_data.json @@ -0,0 +1 @@ +{"jarName":"CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar","modId":"crash_assistant","version":"1.11.0","mixinConfigs":["crash_assistant.mixins.json","crash_assistant.neoforge.mixins.json"],"jarJarMods":[{"jarName":"app.jar","mixinConfigs":[],"jarJarMods":[],"pathFromJarJar":"/META-INF/jarjar/"},{"jarName":"crash_assistant-neoforge.jar","modId":"crash_assistant","version":"1.11.0","mixinConfigs":["crash_assistant.mixins.json","crash_assistant.neoforge.mixins.json"],"jarJarMods":[],"pathFromJarJar":"/META-INF/jarjar/"}],"curseForgeHash":3563009100,"modrinthHash":"34aee29c7738861a61ff8fc4789ee490112364af"} \ No newline at end of file diff --git a/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar b/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar new file mode 100644 index 0000000..601f04e Binary files /dev/null and b/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar differ diff --git a/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar.input b/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar.input new file mode 100644 index 0000000..b98f944 --- /dev/null +++ b/Server/mods/.connector/biomespy-fabric-1.21.1-1.3.3_mapped_moj_1.21.1.jar.input @@ -0,0 +1 @@ +2.0.0-beta.14+1.21.1,dedicated_server,23a2423b0b233b3a44eacf15e5ea7c2ffd61c6c1df572562a4f98da5db0a8aa9 \ No newline at end of file diff --git a/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar b/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar new file mode 100644 index 0000000..9039ed9 Binary files /dev/null and b/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar differ diff --git a/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar.input b/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar.input new file mode 100644 index 0000000..88ba92b --- /dev/null +++ b/Server/mods/.connector/countereds_terrain_slabs-2.1.2_mapped_moj_1.21.1.jar.input @@ -0,0 +1 @@ +2.0.0-beta.14+1.21.1,dedicated_server,830068d01ad34da38798eaf1b9dfa83870331c49807f1bf9b1591797e9b5b2eb \ No newline at end of file diff --git a/Server/mods/.connector/patch_audit.txt b/Server/mods/.connector/patch_audit.txt new file mode 100644 index 0000000..3435861 --- /dev/null +++ b/Server/mods/.connector/patch_audit.txt @@ -0,0 +1,7 @@ +==== Connector Mixin Patch Audit Summary ==== +Successful: 0 +Partial: 0 +Failed: 0 +Success rate: не число% Accuracy: не число% +============================================= + diff --git a/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar b/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar new file mode 100644 index 0000000..be924a0 Binary files /dev/null and b/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar differ diff --git a/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar.input b/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar.input new file mode 100644 index 0000000..4cb7f44 --- /dev/null +++ b/Server/mods/.connector/temp/countereds_terrain_slabs-2.1.2$midnightlib-1.6.9+1.21-fabric.jar.input @@ -0,0 +1 @@ +2.0.0-beta.14+1.21.1,dedicated_server,c86e66fb3561ff18c8544c7c506c4e4fc8865b069ad45fc4f6d3677e688797f7 \ No newline at end of file diff --git a/Server/mods/AmbientSounds_NEOFORGE_v6.3.4_mc1.21.1.jar b/Server/mods/AmbientSounds_NEOFORGE_v6.3.4_mc1.21.1.jar deleted file mode 100644 index cf0c920..0000000 Binary files a/Server/mods/AmbientSounds_NEOFORGE_v6.3.4_mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/Audio Improvements v1.1 - NeoForge 1.21-1.21.3.jar b/Server/mods/Audio Improvements v1.1 - NeoForge 1.21-1.21.3.jar deleted file mode 100644 index 7efd4d7..0000000 Binary files a/Server/mods/Audio Improvements v1.1 - NeoForge 1.21-1.21.3.jar and /dev/null differ diff --git a/Server/mods/ChatImpressiveAnimation-neoforge-1.5.0+mc1.21.5.jar b/Server/mods/ChatImpressiveAnimation-neoforge-1.5.0+mc1.21.5.jar deleted file mode 100644 index 512cf83..0000000 Binary files a/Server/mods/ChatImpressiveAnimation-neoforge-1.5.0+mc1.21.5.jar and /dev/null differ diff --git a/Server/mods/Controlling-neoforge-1.21.1-19.0.5.jar b/Server/mods/Controlling-neoforge-1.21.1-19.0.5.jar deleted file mode 100644 index e8d0868..0000000 Binary files a/Server/mods/Controlling-neoforge-1.21.1-19.0.5.jar and /dev/null differ diff --git a/Server/mods/EuphoriaPatcher-1.8.6-r5.7.1-neoforge.jar b/Server/mods/EuphoriaPatcher-1.8.6-r5.7.1-neoforge.jar deleted file mode 100644 index 65e021a..0000000 Binary files a/Server/mods/EuphoriaPatcher-1.8.6-r5.7.1-neoforge.jar and /dev/null differ diff --git a/Server/mods/ItemPhysicLite_NEOFORGE_v1.6.8_mc1.21.1.jar b/Server/mods/ItemPhysicLite_NEOFORGE_v1.6.8_mc1.21.1.jar deleted file mode 100644 index 693fed2..0000000 Binary files a/Server/mods/ItemPhysicLite_NEOFORGE_v1.6.8_mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/Ixeris-4.1.5+1.21.1-neoforge.jar b/Server/mods/Ixeris-4.1.5+1.21.1-neoforge.jar deleted file mode 100644 index d1dc050..0000000 Binary files a/Server/mods/Ixeris-4.1.5+1.21.1-neoforge.jar and /dev/null differ diff --git a/Server/mods/MouseTweaks-neoforge-mc1.21-2.26.1.jar b/Server/mods/MouseTweaks-neoforge-mc1.21-2.26.1.jar deleted file mode 100644 index 1623784..0000000 Binary files a/Server/mods/MouseTweaks-neoforge-mc1.21-2.26.1.jar and /dev/null differ diff --git a/Server/mods/Not Enough Recipe Book-NEOFORGE-0.4.3+1.21.jar b/Server/mods/Not Enough Recipe Book-NEOFORGE-0.4.3+1.21.jar deleted file mode 100644 index a482900..0000000 Binary files a/Server/mods/Not Enough Recipe Book-NEOFORGE-0.4.3+1.21.jar and /dev/null differ diff --git a/Server/mods/PickUpNotifier-v21.1.1-1.21.1-NeoForge.jar b/Server/mods/PickUpNotifier-v21.1.1-1.21.1-NeoForge.jar deleted file mode 100644 index 1c7c1c7..0000000 Binary files a/Server/mods/PickUpNotifier-v21.1.1-1.21.1-NeoForge.jar and /dev/null differ diff --git a/Server/mods/Ping-Wheel-1.12.1-neoforge-1.21.1.jar b/Server/mods/Ping-Wheel-1.12.1-neoforge-1.21.1.jar deleted file mode 100644 index e4be27f..0000000 Binary files a/Server/mods/Ping-Wheel-1.12.1-neoforge-1.21.1.jar and /dev/null differ diff --git a/Server/mods/PresenceFootsteps-1.21.1-1.12.0-beta.1-1.21NeoForge.jar b/Server/mods/PresenceFootsteps-1.21.1-1.12.0-beta.1-1.21NeoForge.jar deleted file mode 100644 index abe3027..0000000 Binary files a/Server/mods/PresenceFootsteps-1.21.1-1.12.0-beta.1-1.21NeoForge.jar and /dev/null differ diff --git a/Server/mods/Pretty Rain-1.21.1-NeoForge-1.1.4.jar b/Server/mods/Pretty Rain-1.21.1-NeoForge-1.1.4.jar deleted file mode 100644 index 8318c47..0000000 Binary files a/Server/mods/Pretty Rain-1.21.1-NeoForge-1.1.4.jar and /dev/null differ diff --git a/Server/mods/auto_third_person-neo-1.21.1-2.2.jar b/Server/mods/auto_third_person-neo-1.21.1-2.2.jar deleted file mode 100644 index 79fce16..0000000 Binary files a/Server/mods/auto_third_person-neo-1.21.1-2.2.jar and /dev/null differ diff --git a/Server/mods/betterfpsdist-1.21-6.0.jar b/Server/mods/betterfpsdist-1.21-6.0.jar deleted file mode 100644 index 2d8e732..0000000 Binary files a/Server/mods/betterfpsdist-1.21-6.0.jar and /dev/null differ diff --git a/Server/mods/biomespy-fabric-1.21.1-1.3.3.jar b/Server/mods/biomespy-fabric-1.21.1-1.3.3.jar deleted file mode 100644 index a8d0a68..0000000 Binary files a/Server/mods/biomespy-fabric-1.21.1-1.3.3.jar and /dev/null differ diff --git a/Server/mods/c2me-neoforge-mc1.21.1-0.3.0+alpha.0.90.jar b/Server/mods/c2me-neoforge-mc1.21.1-0.3.0+alpha.0.90.jar deleted file mode 100644 index 4d5f31a..0000000 Binary files a/Server/mods/c2me-neoforge-mc1.21.1-0.3.0+alpha.0.90.jar and /dev/null differ diff --git a/Server/mods/certain_questing_additions-neoforge-1.1.5+mc1.21.1.jar b/Server/mods/certain_questing_additions-neoforge-1.1.5+mc1.21.1.jar deleted file mode 100644 index c0e93ea..0000000 Binary files a/Server/mods/certain_questing_additions-neoforge-1.1.5+mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/colorwheel-neoforge-1.2.4+mc1.21.1.jar b/Server/mods/colorwheel-neoforge-1.2.4+mc1.21.1.jar deleted file mode 100644 index 70d588e..0000000 Binary files a/Server/mods/colorwheel-neoforge-1.2.4+mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/continuity-3.0.0+1.21.neoforge.jar b/Server/mods/continuity-3.0.0+1.21.neoforge.jar deleted file mode 100644 index 950fa21..0000000 Binary files a/Server/mods/continuity-3.0.0+1.21.neoforge.jar and /dev/null differ diff --git a/Server/mods/controllable-neoforge-1.21.1-0.25.4.jar b/Server/mods/controllable-neoforge-1.21.1-0.25.4.jar deleted file mode 100644 index 2f3be93..0000000 Binary files a/Server/mods/controllable-neoforge-1.21.1-0.25.4.jar and /dev/null differ diff --git a/Server/mods/e4mc-neoforge-6.1.0.jar b/Server/mods/e4mc-neoforge-6.1.0.jar deleted file mode 100644 index caf8c47..0000000 Binary files a/Server/mods/e4mc-neoforge-6.1.0.jar and /dev/null differ diff --git a/Server/mods/emi-1.1.22+1.21.1+neoforge.jar b/Server/mods/emi-1.1.22+1.21.1+neoforge.jar deleted file mode 100644 index bf8f293..0000000 Binary files a/Server/mods/emi-1.1.22+1.21.1+neoforge.jar and /dev/null differ diff --git a/Server/mods/emi_enchanting-0.1.2+1.21+neoforge.jar b/Server/mods/emi_enchanting-0.1.2+1.21+neoforge.jar deleted file mode 100644 index 81d4c14..0000000 Binary files a/Server/mods/emi_enchanting-0.1.2+1.21+neoforge.jar and /dev/null differ diff --git a/Server/mods/emi_loot-0.7.9+1.21+neoforge.jar b/Server/mods/emi_loot-0.7.9+1.21+neoforge.jar deleted file mode 100644 index 45b9cec..0000000 Binary files a/Server/mods/emi_loot-0.7.9+1.21+neoforge.jar and /dev/null differ diff --git a/Server/mods/entity_model_features_1.21-neoforge-3.0.12.jar b/Server/mods/entity_model_features_1.21-neoforge-3.0.12.jar deleted file mode 100644 index bf5f81e..0000000 Binary files a/Server/mods/entity_model_features_1.21-neoforge-3.0.12.jar and /dev/null differ diff --git a/Server/mods/entity_texture_features_1.21-neoforge-7.0.9.jar b/Server/mods/entity_texture_features_1.21-neoforge-7.0.9.jar deleted file mode 100644 index bfe5125..0000000 Binary files a/Server/mods/entity_texture_features_1.21-neoforge-7.0.9.jar and /dev/null differ diff --git a/Server/mods/entityculling-neoforge-1.9.5-mc1.21.1.jar b/Server/mods/entityculling-neoforge-1.9.5-mc1.21.1.jar deleted file mode 100644 index 9f1235c..0000000 Binary files a/Server/mods/entityculling-neoforge-1.9.5-mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/fancymenu_neoforge_3.8.1_MC_1.21.1.jar b/Server/mods/fancymenu_neoforge_3.8.1_MC_1.21.1.jar deleted file mode 100644 index 9ff0920..0000000 Binary files a/Server/mods/fancymenu_neoforge_3.8.1_MC_1.21.1.jar and /dev/null differ diff --git a/Server/mods/fancytoasts-neoforge-1.21.1-1.4.6.jar b/Server/mods/fancytoasts-neoforge-1.21.1-1.4.6.jar deleted file mode 100644 index 5f88c50..0000000 Binary files a/Server/mods/fancytoasts-neoforge-1.21.1-1.4.6.jar and /dev/null differ diff --git a/Server/mods/fast-ip-ping-v1.0.8-mc1.21.1-neoforge.jar b/Server/mods/fast-ip-ping-v1.0.8-mc1.21.1-neoforge.jar deleted file mode 100644 index 775eca7..0000000 Binary files a/Server/mods/fast-ip-ping-v1.0.8-mc1.21.1-neoforge.jar and /dev/null differ diff --git a/Server/mods/flerovium-neoforge-1.21.1-1.0.18-all.jar b/Server/mods/flerovium-neoforge-1.21.1-1.0.18-all.jar deleted file mode 100644 index c1842c4..0000000 Binary files a/Server/mods/flerovium-neoforge-1.21.1-1.0.18-all.jar and /dev/null differ diff --git a/Server/mods/gnetum-3.3.1.jar b/Server/mods/gnetum-3.3.1.jar deleted file mode 100644 index cbfc5c4..0000000 Binary files a/Server/mods/gnetum-3.3.1.jar and /dev/null differ diff --git a/Server/mods/iris-neoforge-1.8.12+mc1.21.1.jar b/Server/mods/iris-neoforge-1.8.12+mc1.21.1.jar deleted file mode 100644 index edb687d..0000000 Binary files a/Server/mods/iris-neoforge-1.8.12+mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/iris_shader_folder-1.2.5-neoforge.jar b/Server/mods/iris_shader_folder-1.2.5-neoforge.jar deleted file mode 100644 index 84d1994..0000000 Binary files a/Server/mods/iris_shader_folder-1.2.5-neoforge.jar and /dev/null differ diff --git a/Server/mods/notenoughanimations-neoforge-1.11.3-mc1.21.1.jar b/Server/mods/notenoughanimations-neoforge-1.11.3-mc1.21.1.jar deleted file mode 100644 index 7ffcd62..0000000 Binary files a/Server/mods/notenoughanimations-neoforge-1.11.3-mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/polytone-1.21-3.6.4-neoforge.jar b/Server/mods/polytone-1.21-3.6.4-neoforge.jar deleted file mode 100644 index b273377..0000000 Binary files a/Server/mods/polytone-1.21-3.6.4-neoforge.jar and /dev/null differ diff --git a/Server/mods/reeses-sodium-options-neoforge-1.8.3+mc1.21.4.jar b/Server/mods/reeses-sodium-options-neoforge-1.8.3+mc1.21.4.jar deleted file mode 100644 index 42863f1..0000000 Binary files a/Server/mods/reeses-sodium-options-neoforge-1.8.3+mc1.21.4.jar and /dev/null differ diff --git a/Server/mods/smart_particles-21.8.10.jar b/Server/mods/smart_particles-21.8.10.jar deleted file mode 100644 index 6609824..0000000 Binary files a/Server/mods/smart_particles-21.8.10.jar and /dev/null differ diff --git a/Server/mods/sodium-neoforge-0.6.13+mc1.21.1.jar b/Server/mods/sodium-neoforge-0.6.13+mc1.21.1.jar deleted file mode 100644 index b4b3a98..0000000 Binary files a/Server/mods/sodium-neoforge-0.6.13+mc1.21.1.jar and /dev/null differ diff --git a/Server/mods/sodiumdynamiclights-neoforge-1.0.10-1.21.1.jar b/Server/mods/sodiumdynamiclights-neoforge-1.0.10-1.21.1.jar deleted file mode 100644 index 196c0eb..0000000 Binary files a/Server/mods/sodiumdynamiclights-neoforge-1.0.10-1.21.1.jar and /dev/null differ diff --git a/Server/mods/sodiumextras-neoforge-1.0.8-1.21.1.jar b/Server/mods/sodiumextras-neoforge-1.0.8-1.21.1.jar deleted file mode 100644 index eb292ce..0000000 Binary files a/Server/mods/sodiumextras-neoforge-1.0.8-1.21.1.jar and /dev/null differ diff --git a/Server/mods/sodiumoptionsapi-neoforge-1.0.10-1.21.1.jar b/Server/mods/sodiumoptionsapi-neoforge-1.0.10-1.21.1.jar deleted file mode 100644 index a14763a..0000000 Binary files a/Server/mods/sodiumoptionsapi-neoforge-1.0.10-1.21.1.jar and /dev/null differ diff --git a/Server/mods/sound_physics_perfected-1.17.0-alpha+1.21.1-neoforge.jar b/Server/mods/sound_physics_perfected-1.17.0-alpha+1.21.1-neoforge.jar deleted file mode 100644 index 8d53dbf..0000000 Binary files a/Server/mods/sound_physics_perfected-1.17.0-alpha+1.21.1-neoforge.jar and /dev/null differ diff --git a/Server/mods/super_resolution-neoforge-1.21-1.21.1-0.8.0-alpha.1.jar b/Server/mods/super_resolution-neoforge-1.21-1.21.1-0.8.0-alpha.1.jar deleted file mode 100644 index 72ba4e3..0000000 Binary files a/Server/mods/super_resolution-neoforge-1.21-1.21.1-0.8.0-alpha.1.jar and /dev/null differ diff --git a/Server/mods/xaerominimap-neoforge-1.21.1-25.3.10.jar b/Server/mods/xaerominimap-neoforge-1.21.1-25.3.10.jar deleted file mode 100644 index 069850d..0000000 Binary files a/Server/mods/xaerominimap-neoforge-1.21.1-25.3.10.jar and /dev/null differ diff --git a/Server/mods/xaeroworldmap-neoforge-1.21.1-1.40.11.jar b/Server/mods/xaeroworldmap-neoforge-1.21.1-1.40.11.jar deleted file mode 100644 index e824211..0000000 Binary files a/Server/mods/xaeroworldmap-neoforge-1.21.1-1.40.11.jar and /dev/null differ diff --git a/config/fabric/indigo-renderer.properties b/config/fabric/indigo-renderer.properties index 45f3385..c4ab182 100644 --- a/config/fabric/indigo-renderer.properties +++ b/config/fabric/indigo-renderer.properties @@ -1,5 +1,5 @@ #Indigo properties file -#Thu May 07 22:07:46 MSK 2026 +#Thu May 07 22:56:06 MSK 2026 always-tesselate-blocks=auto ambient-occlusion-mode=hybrid debug-compare-lighting=auto diff --git a/config/iris.properties b/config/iris.properties index 7e6d1d3..c6985ef 100644 --- a/config/iris.properties +++ b/config/iris.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Thu May 07 22:08:14 MSK 2026 +#Thu May 07 22:56:17 MSK 2026 allowUnknownShaders=false colorSpace=SRGB disableUpdateMessage=false diff --git a/controllable_natives/SDL/2.32.8/SDL2.dll b/controllable_natives/SDL/2.32.8/SDL2.dll new file mode 100644 index 0000000..bfc0bd6 Binary files /dev/null and b/controllable_natives/SDL/2.32.8/SDL2.dll differ diff --git a/local/crash_assistant/204804_1778183725352.info b/local/crash_assistant/204804_1778183725352.info new file mode 100644 index 0000000..1caaf91 --- /dev/null +++ b/local/crash_assistant/204804_1778183725352.info @@ -0,0 +1 @@ +202124 : 1778183730878 \ No newline at end of file diff --git a/local/crash_assistant/226480_1778180766070_app.jar b/local/crash_assistant/204804_1778183725352_app.jar similarity index 100% rename from local/crash_assistant/226480_1778180766070_app.jar rename to local/crash_assistant/204804_1778183725352_app.jar diff --git a/local/crash_assistant/226480_1778180766070_args.info b/local/crash_assistant/204804_1778183725352_args.info similarity index 95% rename from local/crash_assistant/226480_1778180766070_args.info rename to local/crash_assistant/204804_1778183725352_args.info index 1abc29f..bfcbc02 100644 --- a/local/crash_assistant/226480_1778180766070_args.info +++ b/local/crash_assistant/204804_1778183725352_args.info @@ -1,9 +1,9 @@ -jarPath -local\crash_assistant\226480_1778180766070_app.jar +local\crash_assistant\204804_1778183725352_app.jar -parentPID -226480 +204804 -parentStarted -1778180766070 +1778183725352 -platform NEOFORGE -loaderJarName @@ -19,7 +19,7 @@ LURvcy5uYW1lPVdpbmRvd3MgMTAsIC1Eb3MudmVyc2lvbj0xMC4wLCAtWFg6SGVhcER1bXBQYXRoPU1v -crashAssistantModJarName CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar -classPath -local\crash_assistant\226480_1778180766070_app.jar;local\crash_assistant\226480_1778180766070_mod.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\org\apache\logging\log4j\log4j-api\2.22.1\log4j-api-2.22.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\org\apache\logging\log4j\log4j-core\2.22.1\log4j-core-2.22.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\com\google\code\gson\gson\2.10.1\gson-2.10.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\commons-io\commons-io\2.15.1\commons-io-2.15.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\net\java\dev\jna\jna\5.14.0\jna-5.14.0.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\net\java\dev\jna\jna-platform\5.14.0\jna-platform-5.14.0.jar +local\crash_assistant\204804_1778183725352_app.jar;local\crash_assistant\204804_1778183725352_mod.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\org\apache\logging\log4j\log4j-api\2.22.1\log4j-api-2.22.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\org\apache\logging\log4j\log4j-core\2.22.1\log4j-core-2.22.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\com\google\code\gson\gson\2.10.1\gson-2.10.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\commons-io\commons-io\2.15.1\commons-io-2.15.1.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\net\java\dev\jna\jna\5.14.0\jna-5.14.0.jar;C:\Users\mrleo1nid\AppData\Roaming\.minecraft\libraries\net\java\dev\jna\jna-platform\5.14.0\jna-platform-5.14.0.jar -minecraftXms 8m -minecraftXmx @@ -27,11 +27,11 @@ local\crash_assistant\226480_1778180766070_app.jar;local\crash_assistant\226480_ -systemRAM 31.9g -systemUsedRAMAtMinecraftLaunchMoment -28.6g +19.4g -systemSwapSpace -28.0g +16.0g -systemUsedSwapSpaceAtMinecraftLaunchMoment -2.7g +1.6g -processor QU1EIFJ5emVuIDUgNTYwMFggNi1Db3JlIFByb2Nlc3NvciAgICAgICAgICAgICA= -serialisedGPUs diff --git a/local/crash_assistant/226480_1778180766070_gpu-detect-jni.dll b/local/crash_assistant/204804_1778183725352_gpu-detect-jni.dll similarity index 100% rename from local/crash_assistant/226480_1778180766070_gpu-detect-jni.dll rename to local/crash_assistant/204804_1778183725352_gpu-detect-jni.dll diff --git a/Server/mods/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar b/local/crash_assistant/204804_1778183725352_mod.jar similarity index 100% rename from Server/mods/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.0.jar rename to local/crash_assistant/204804_1778183725352_mod.jar diff --git a/local/crash_assistant/226480_1778180766070.info b/local/crash_assistant/226480_1778180766070.info deleted file mode 100644 index eeceef8..0000000 --- a/local/crash_assistant/226480_1778180766070.info +++ /dev/null @@ -1 +0,0 @@ -202800 : 1778180777815 \ No newline at end of file diff --git a/local/crash_assistant/226480_1778180766070_mod.jar b/local/crash_assistant/226480_1778180766070_mod.jar deleted file mode 100644 index 743ee5f..0000000 Binary files a/local/crash_assistant/226480_1778180766070_mod.jar and /dev/null differ diff --git a/local/crash_assistant/renderer_pid226480.tmp b/local/crash_assistant/renderer_pid204804.tmp similarity index 100% rename from local/crash_assistant/renderer_pid226480.tmp rename to local/crash_assistant/renderer_pid204804.tmp diff --git a/local/crash_assistant/successful_launch_pid204804.tmp b/local/crash_assistant/successful_launch_pid204804.tmp new file mode 100644 index 0000000..9eef54a --- /dev/null +++ b/local/crash_assistant/successful_launch_pid204804.tmp @@ -0,0 +1 @@ +1778183818206 \ No newline at end of file diff --git a/natives/jna14724686192902094308.dll b/natives/jna16961379458820393096.dll similarity index 100% rename from natives/jna14724686192902094308.dll rename to natives/jna16961379458820393096.dll diff --git a/natives/jna14724686192902094308.dll.x b/natives/jna16961379458820393096.dll.x similarity index 100% rename from natives/jna14724686192902094308.dll.x rename to natives/jna16961379458820393096.dll.x diff --git a/options.txt b/options.txt index 69a8e4d..a3c2d62 100644 --- a/options.txt +++ b/options.txt @@ -1,4 +1,3 @@ -lang:ru_ru version:3955 ao:true biomeBlendRadius:2 @@ -52,6 +51,7 @@ narratorHotkey:true resourcePacks:["vanilla","fabric","mod_resources","moonlight:merged_pack","file/coquet-0-9-1.zip","file/Freshly Detailed 4.0.zip","file/Cataclysm Reimagined v1.3.5 for NeoForge.zip","file/Create Touch-Ups v1.0.zip","file/BetterBetterX-v1.1-noStone.zip","file/waystones_1.21.1.zip","file/FTB-Vanilla-Like-1.0.zip","file/mod-descriptions-v8.1.zip","file/TerralithBiomesNames.zip","file/MandalasGUI+Dakmode_1.21.8_v2.5.zip","file/Mandala Utopia.zip","file/Reimagined Tweaks 11.zip","file/ShaderPanoramaFor1.21.zip","file/music-and-melody-1.21.5-v2.1.0.zip","file/Atmospheric Skies Fog 1.3.zip","file/FreshAnimations_v1.9.2.zip","file/FA+Details-v1.1.zip","file/FA+Spiders-v1.1.zip","file/-1.21.2 Fresh Moves v3.1 (No Animated Eyes).zip"] incompatibleResourcePacks:["file/coquet-0-9-1.zip","file/FTB-Vanilla-Like-1.0.zip","file/TerralithBiomesNames.zip","file/MandalasGUI+Dakmode_1.21.8_v2.5.zip"] lastServer: +lang:ru_ru chatVisibility:0 chatOpacity:1.0 chatLineSpacing:0.0 @@ -291,8 +291,8 @@ key_key.spyglass-improvements.use:key.keyboard.z key_key.deeperdarker.boost:key.keyboard.b key_key.deeperdarker.transmit:key.keyboard.v key_key.super_resolution.open_config:key.keyboard.f6 -key_key.golemoverhaul.netherite_golem_summon:key.keyboard.unknown key_key.ftbteams.open_gui:key.keyboard.unknown +key_key.golemoverhaul.netherite_golem_summon:key.keyboard.unknown key_key.ftbquests.quests:key.keyboard.l key_key.too_many_entities.toggle_mod:key.keyboard.unknown key_keybindings.spell_engine.bypass_spell_hotbar:key.keyboard.left.alt @@ -327,8 +327,8 @@ key_create.keyinfo.ctrl_modifier:key.keyboard.left.control key_create.keyinfo.alt_modifier:key.keyboard.left.alt key_key.presencefootsteps.settings:key.keyboard.unknown key_key.entityculling.toggle:key.keyboard.unknown -soundCategory_master:1.0 -soundCategory_music:0.5017605633802817 +soundCategory_master:0.4064569536423841 +soundCategory_music:0.08274647887323944 soundCategory_record:0.5035211267605634 soundCategory_weather:0.5088028169014085 soundCategory_block:0.5070422535211268 diff --git a/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.fragment.ogl.spv b/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.fragment.ogl.spv new file mode 100644 index 0000000..9f5cc14 Binary files /dev/null and b/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.fragment.ogl.spv differ diff --git a/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.vertex.ogl.spv b/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.vertex.ogl.spv new file mode 100644 index 0000000..4474dd5 Binary files /dev/null and b/sr_shaderCache/SGSRV1.4536d5781758698a8bdea792605e31c7.vertex.ogl.spv differ