diff --git a/CHANGELOG.md b/CHANGELOG.md index 584467168..6c126c467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ ### Bug fixes ### Translation updates +## [0.11.15] - 31-12-2025 +### Bug fixes +- Fixed Greate stress levels (#2564) @Pyritie +- Fixed crash when looking at steam engines while holding a shaft (#2565) + ## [0.11.14] - 31-12-2025 ### Changes - Change energy acceptor to use a machine hull instead of a converter. (#2553) @thederpysockdude123 diff --git a/config/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index b4218ae78..fd6a18dda 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -179,12 +179,12 @@ "curseForgeHash": 1796431356, "modrinthHash": "98ef976a9b356dce459fdd249ff19ad14fd375dd" }, - "beneath-1.20.1-1.0.5.jar": { - "jarName": "beneath-1.20.1-1.0.5.jar", + "beneath-1.20.1-1.0.6.jar": { + "jarName": "beneath-1.20.1-1.0.6.jar", "modId": "beneath", - "version": "1.0.5", - "curseForgeHash": 2046402937, - "modrinthHash": "12edd937a9070a71e50dcb53fd757b30d115bc2a" + "version": "1.0.6", + "curseForgeHash": 4114027705, + "modrinthHash": "fc9208fa33d9f6868ab123dc0a73049fe3805201" }, "betterp2p-1.5.0-forge.jar": { "jarName": "betterp2p-1.5.0-forge.jar", @@ -655,12 +655,12 @@ "curseForgeHash": 3617977798, "modrinthHash": "5d21f85a95332dc002cd26ce085934a0d3605e08" }, - "Firmalife-1.20.1-2.1.25.jar": { - "jarName": "Firmalife-1.20.1-2.1.25.jar", + "Firmalife-1.20.1-2.1.26.jar": { + "jarName": "Firmalife-1.20.1-2.1.26.jar", "modId": "firmalife", - "version": "2.1.25", - "curseForgeHash": 737375744, - "modrinthHash": "9c80bd40edf4625e578e42d8f7bf5f34f43215ee" + "version": "2.1.26", + "curseForgeHash": 1770069402, + "modrinthHash": "679e75ed6d8180457f0593a1e3f9b0077a1dca9c" }, "flickerfix-1.20.1-4.0.1.jar": { "jarName": "flickerfix-1.20.1-4.0.1.jar", @@ -795,12 +795,12 @@ "curseForgeHash": 3324262533, "modrinthHash": "aa53625ab5e145c6aa196645335b062b37ae82da" }, - "greate-0.0.59.jar": { - "jarName": "greate-0.0.59.jar", + "greate-0.0.60.jar": { + "jarName": "greate-0.0.60.jar", "modId": "greate", - "version": "0.0.59", - "curseForgeHash": 3700389471, - "modrinthHash": "dc87ce9d17abc7967e26aac5d9e3480d4e36c7d1" + "version": "0.0.60", + "curseForgeHash": 1014860832, + "modrinthHash": "3fc325df338f275847344f553ad81c3e9be0bc80" }, "gtceu-1.20.1-7.4.0.jar": { "jarName": "gtceu-1.20.1-7.4.0.jar", @@ -1402,12 +1402,12 @@ "curseForgeHash": 837967200, "modrinthHash": "107d4aec4694c509ea7ea8f3963478ae8002f46e" }, - "TerraFirmaGreg-Core-Modern-0.8.12.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.8.12.jar", + "TerraFirmaGreg-Core-Modern-0.8.13.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.8.13.jar", "modId": "tfg", - "version": "0.8.12", - "curseForgeHash": 3615222056, - "modrinthHash": "320db558605f446a76db4355e1a8e1b008c33630" + "version": "0.8.13", + "curseForgeHash": 1252674808, + "modrinthHash": "557984bbe48f571e60426b370d6fa52baa4a1cef" }, "tfc_gurman-1.2.0.jar": { "jarName": "tfc_gurman-1.2.0.jar", diff --git a/defaultconfigs/greate-server.toml b/defaultconfigs/greate-server.toml index c97be947b..cdf03e0a6 100644 --- a/defaultconfigs/greate-server.toml +++ b/defaultconfigs/greate-server.toml @@ -1,7 +1,3 @@ -#. -#Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning. -#Range: 0.0 ~ 3.4028234663852886E38 -fanSpeedMultiplier = 0.75 #. #Parameters and abilities of Greate's kinetic mechanisms @@ -243,91 +239,6 @@ fanSpeedMultiplier = 0.75 neutronium_mechanical_saw = 5.0 neutronium_mechanical_pump = 5.0 - #. - #Fine tune settings related to tiers - [kinetics.stressValues.v2.maxCapacity] - - #. - #. - #Settings related to andesite tier machines - [kinetics.stressValues.v2.maxCapacity.andesite] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - andesiteMaxCapacity = 32 - - #. - #Settings related to steel tier machines - [kinetics.stressValues.v2.maxCapacity.steel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - steelMaxCapacity = 128 - - #. - #Settings related to aluminium tier machines - [kinetics.stressValues.v2.maxCapacity.aluminium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - aluminiumMaxCapacity = 512 - - #. - #Settings related to stainless steel tier machines - [kinetics.stressValues.v2.maxCapacity.stainlessSteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - stainlessSteelMaxCapacity = 2048 - - #. - #Settings related to titanium tier machines - [kinetics.stressValues.v2.maxCapacity.titanium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - titaniumMaxCapacity = 8192 - - #. - #Settings related to tungstensteel tier machines - [kinetics.stressValues.v2.maxCapacity.tungstensteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - tungstensteelMaxCapacity = 32768 - - #. - #Settings related to palladium tier machines - [kinetics.stressValues.v2.maxCapacity.palladium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - palladiumMaxCapacity = 131072 - - #. - #Settings related to naquadah tier machines - [kinetics.stressValues.v2.maxCapacity.naquadah] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - naquadahMaxCapacity = 524288 - - #. - #Settings related to darmstadtium tier machines - [kinetics.stressValues.v2.maxCapacity.darmstadtium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - darmstadtiumMaxCapacity = 2097152 - - #. - #Settings related to neutronium tier machines - [kinetics.stressValues.v2.maxCapacity.neutronium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - neutroniumMaxCapacity = 8388608 - #. #Fine tune settings related to pumps [kinetics.pumps] diff --git a/kubejs/assets/emi/index/stacks/hidden.json b/kubejs/assets/emi/index/stacks/hidden.json index c070e2285..ef4783295 100644 --- a/kubejs/assets/emi/index/stacks/hidden.json +++ b/kubejs/assets/emi/index/stacks/hidden.json @@ -1,6 +1,5 @@ { "removed": [ - "item:gtceu:sus_record", - "expatternprovider:fishbig" + "item:gtceu:sus_record" ] } \ No newline at end of file diff --git a/kubejs/assets/species/lang/en_us.json b/kubejs/assets/species/lang/en_us.json index 535a349cf..8a6bbf4a8 100644 --- a/kubejs/assets/species/lang/en_us.json +++ b/kubejs/assets/species/lang/en_us.json @@ -10,12 +10,17 @@ "subtitles.item.species.wicked_swapper.throw": "Swapper Pearl flies", "subtitles.item.species.wicked_swapper.fail": "Swapper Pearl drops", "subtitles.item.species.wicked_swapper.teleport": "Swapper Pearl swaps", - "advancements.species.wicked_mask_wither.description": "Disguise yourself as a Wither using a Disguise Kit", "item.species.trooper_spawn_egg": "Sulfie Spawn Egg", + "item.species.wicked_treat.desc.snatched": "Super Speed II (0:45)", + "item.species.wicked_treat.desc.iron_will": "Knockback Resistance (0:45)", "entity.species.trooper": "Sulfie", "subtitles.entity.species.trooper.death": "Sulfie dies", "subtitles.entity.species.trooper.hurt": "Sulfie hurts", "subtitles.entity.species.trooper.step": "Sulfie trots", "subtitles.entity.species.trooper.uproot": "Sulfie uproots", - "subtitles.entity.species.trooper.plant": "Sulfie plants" + "subtitles.entity.species.trooper.plant": "Sulfie plants", + "effect.species.iron_will": "Knockback Resistance", + "effect.species.iron_will.description": "Prevents all knockback.", + "effect.species.snatched": "Super Speed", + "effect.species.snatched.description": "Grants faster Movement Speed scaling with levels. Makes affected entities taller and thinner." } \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json b/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json index bbbe7e297..665cb3693 100644 --- a/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json +++ b/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json @@ -22,7 +22,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{BotariumData: {StoredFluids: [{Amount: 1000, Fluid: \"tfg:compressed_heliox_3\"}]}}" + "tag": "{BotariumData: {StoredFluids: [{Amount: 1000, Fluid: \"tfg:compressed_nitrox\"}]}}" } ] }, diff --git a/kubejs/startup_scripts/extended_ae2/constants.js b/kubejs/startup_scripts/extended_ae2/constants.js index 486627ec1..26cf04231 100644 --- a/kubejs/startup_scripts/extended_ae2/constants.js +++ b/kubejs/startup_scripts/extended_ae2/constants.js @@ -1,15 +1,10 @@ -// priority: -100 +// priority: 0 "use strict"; global.EXTENDED_AE2_DISABLED_ITEMS = [ 'expatternprovider:infinity_cell', - 'expatternprovider:fishbig', - //'expatternprovider:pattern_provider_upgrade', - //'expatternprovider:interface_upgrade', 'expatternprovider:io_bus_upgrade', - //'expatternprovider:pattern_terminal_upgrade', - //'expatternprovider:drive_upgrade', 'expatternprovider:ex_inscriber', 'expatternprovider:crystal_fixer', @@ -17,30 +12,4 @@ global.EXTENDED_AE2_DISABLED_ITEMS = [ 'expatternprovider:caner', 'expatternprovider:circuit_cutter', 'expatternprovider:silicon_block' - - - //в будущем будет крафт - /* - 'expatternprovider:ex_io_port', - 'expatternprovider:wireless_tool', - 'expatternprovider:wireless_connect', - 'expatternprovider:active_formation_plane', - 'expatternprovider:wireless_ex_pat', - 'expatternprovider:pattern_modifier', - 'expatternprovider:threshold_level_emitter', - - 'expatternprovider:ex_export_bus_part', - 'expatternprovider:ex_import_bus_part', - 'expatternprovider:ex_pattern_access_part', - 'expatternprovider:me_packing_tape', - 'expatternprovider:tag_storage_bus', - 'expatternprovider:tag_export_bus', - 'expatternprovider:mod_storage_bus', - 'expatternprovider:mod_export_bus', - 'expatternprovider:precise_export_bus', - 'expatternprovider:ingredient_buffer', - 'expatternprovider:ex_drive', - 'expatternprovider:ex_molecular_assembler', - - */ ] \ No newline at end of file diff --git a/kubejs/startup_scripts/greate/material_modification.js b/kubejs/startup_scripts/greate/material_modification.js new file mode 100644 index 000000000..21b3e8055 --- /dev/null +++ b/kubejs/startup_scripts/greate/material_modification.js @@ -0,0 +1,16 @@ +// priority: 0 +"use strict"; + +const registerGreateMaterialModification = (event) => { + + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + + // Add flags + $GreateMaterials.RoseQuartz.addFlags( + GTMaterialFlags.GENERATE_LENS + ); + + // Material composition + $GreateMaterials.AndesiteAlloy.setComponents([]) + $GreateMaterials.AndesiteAlloy.setFormula("?") +} \ No newline at end of file diff --git a/kubejs/startup_scripts/greate/materials.js b/kubejs/startup_scripts/greate/materials.js index 8a176bd71..562be0323 100644 --- a/kubejs/startup_scripts/greate/materials.js +++ b/kubejs/startup_scripts/greate/materials.js @@ -1,10 +1,11 @@ +// priority: 0 "use strict"; - const registerGreateMaterials = (event) => { // Belt materials should already have an ingot and plate item already const $BeltProperty = Java.loadClass("electrolyte.greate.content.gtceu.material.BeltProperty") const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + const $GreatePropertyKeys = Java.loadClass("electrolyte.greate.content.gtceu.material.GreatePropertyKeys") // Wood belt $GreateMaterials.AndesiteAlloy.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([$GreateMaterials.AndesiteAlloy], 5)) @@ -25,16 +26,17 @@ const registerGreateMaterials = (event) => { GTMaterials.SiliconeRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.StainlessSteel, GTMaterials.Aluminium], 25)) GTMaterials.StyreneButadieneRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.Titanium, GTMaterials.StainlessSteel], 30)) -} -const registerGreateMaterialModification = (event) => { - - const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") - - $GreateMaterials.RoseQuartz.addFlags( - GTMaterialFlags.GENERATE_LENS - ); - - $GreateMaterials.AndesiteAlloy.setComponents([]) - $GreateMaterials.AndesiteAlloy.setFormula("?") + // Change stress levels + let capacity = 32; + $GreateMaterials.AndesiteAlloy.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity); + GTMaterials.Steel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Aluminium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.StainlessSteel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Titanium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.TungstenSteel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.RhodiumPlatedPalladium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.NaquadahAlloy.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Darmstadtium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Neutronium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 7d40ddd51..365c15b14 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1638,7 +1638,7 @@ "files": [ { "type": "modrinth", - "file_name": "beneath-1.20.1-1.0.5.jar", + "file_name": "beneath-1.20.1-1.0.6.jar", "mc_versions": [ "1.20.1" ], @@ -1647,42 +1647,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/d0xgZnLe/beneath-1.20.1-1.0.5.jar", - "id": "d0xgZnLe", + "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/vJG1yevl/beneath-1.20.1-1.0.6.jar", + "id": "vJG1yevl", "parent_id": "6VieRZiz", "hashes": { - "sha512": "0eec3b25e7aebb8df74804d70a054c96e529f3d4cd437173219f891badef05d98996adcae387e6808e6489e18253aa73e6bd1193cfb9dcaf7ac26c92819e6bc8", - "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a" + "sha512": "a609b95ec50aa9be9260beef01bc5cd8915de1c65abc8c6b7ae65dbb70ee5c0c643d20bbafac2772e95977660843b6c4b920161b62845ae1d96e7801dedc97ca", + "sha1": "fc9208fa33d9f6868ab123dc0a73049fe3805201" }, "required_dependencies": [ "JaCEZUhg" ], - "size": 1500972, - "date_published": "2025-08-19T22:18:43.907020Z" + "size": 1519342, + "date_published": "2025-12-31T15:16:00.623753Z" }, { "type": "curseforge", - "file_name": "beneath-1.20.1-1.0.5.jar", + "file_name": "beneath-1.20.1-1.0.6.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "neoforge", - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6905/461/beneath-1.20.1-1.0.5.jar", - "id": "6905461", + "url": "https://edge.forgecdn.net/files/7400/831/beneath-1.20.1-1.0.6.jar", + "id": "7400831", "parent_id": "1113980", "hashes": { - "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a", - "md5": "aeda5af6cf8575a816f7c4ea1630ca97" + "sha1": "fc9208fa33d9f6868ab123dc0a73049fe3805201", + "md5": "cc72b044f795960451830fe49837bcb2" }, "required_dependencies": [ "302973" ], - "size": 1500972, - "date_published": "2025-08-19T22:18:40.447Z" + "size": 1519342, + "date_published": "2025-12-31T15:15:58.277Z" } ] }, @@ -6591,7 +6591,7 @@ "files": [ { "type": "modrinth", - "file_name": "Firmalife-1.20.1-2.1.25.jar", + "file_name": "Firmalife-1.20.1-2.1.26.jar", "mc_versions": [ "1.20.1" ], @@ -6600,22 +6600,22 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/5bKeBHw2/versions/Qz8OzhXv/Firmalife-1.20.1-2.1.25.jar", - "id": "Qz8OzhXv", + "url": "https://cdn.modrinth.com/data/5bKeBHw2/versions/owVJs9G8/Firmalife-1.20.1-2.1.26.jar", + "id": "owVJs9G8", "parent_id": "5bKeBHw2", "hashes": { - "sha512": "5cff31bf79b53ed938703c407c5681040e2b9dbecb23756dd0863267752b1ec9c88861b2cea4a9894a5243ac20c0b80891daa24789a58d04842083606248a520", - "sha1": "9c80bd40edf4625e578e42d8f7bf5f34f43215ee" + "sha512": "049c2a69eb6364af0e925ee613fff85df2a9b0d3d035eed96351cca1abada7e395f0735ba7d523d0bac9ccfbd9d9bc50c8a977f38721a459341559280fbc2015", + "sha1": "679e75ed6d8180457f0593a1e3f9b0077a1dca9c" }, "required_dependencies": [ "JaCEZUhg" ], - "size": 4669651, - "date_published": "2025-12-29T13:59:48.290400Z" + "size": 4669647, + "date_published": "2025-12-31T14:44:50.567174Z" }, { "type": "curseforge", - "file_name": "Firmalife-1.20.1-2.1.25.jar", + "file_name": "Firmalife-1.20.1-2.1.26.jar", "mc_versions": [ "1.20.1" ], @@ -6624,18 +6624,18 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7392/481/Firmalife-1.20.1-2.1.25.jar", - "id": "7392481", + "url": "https://edge.forgecdn.net/files/7400/700/Firmalife-1.20.1-2.1.26.jar", + "id": "7400700", "parent_id": "453394", "hashes": { - "sha1": "9c80bd40edf4625e578e42d8f7bf5f34f43215ee", - "md5": "fc506b07e5168a2cf5e88851f39110b8" + "sha1": "679e75ed6d8180457f0593a1e3f9b0077a1dca9c", + "md5": "8ca3fc3c054741d0d6cc6e1b2070efaa" }, "required_dependencies": [ "302973" ], - "size": 4669651, - "date_published": "2025-12-29T13:59:45.783Z" + "size": 4669647, + "date_published": "2025-12-31T14:44:46.977Z" } ] }, @@ -7130,7 +7130,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.59.jar", + "file_name": "greate-0.0.60.jar", "mc_versions": [ "1.20.1" ], @@ -7139,23 +7139,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/vYPdRVCR/greate-0.0.59.jar", - "id": "vYPdRVCR", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/lkpf6G04/greate-0.0.60.jar", + "id": "lkpf6G04", "parent_id": "8wDcQuht", "hashes": { - "sha512": "58b21629d73b3ff1808b1ac7f3ac8def7eeff0ef803d779165dbce59a57e1e39e38d4b5934a01b36d5398c6fbd6e7aec400c04bbcd613b3a1d5c661a66bf65d9", - "sha1": "dc87ce9d17abc7967e26aac5d9e3480d4e36c7d1" + "sha512": "2584a6b23bbcbfe0d25c4a6af60485e30cf083ff322271d5ee2a566c35943daca86b0edd71d98786811f633af04b5a7f73db9e9f3ac8b72e385b97c1769e7126", + "sha1": "3fc325df338f275847344f553ad81c3e9be0bc80" }, "required_dependencies": [ - "7tG215v7", - "LNytGWDc" + "LNytGWDc", + "7tG215v7" ], - "size": 1252913, - "date_published": "2025-12-30T21:34:48.471572Z" + "size": 1253032, + "date_published": "2025-12-31T17:41:02.391758Z" }, { "type": "curseforge", - "file_name": "greate-0.0.59.jar", + "file_name": "greate-0.0.60.jar", "mc_versions": [ "1.20.1" ], @@ -7164,19 +7164,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7397/872/greate-0.0.59.jar", - "id": "7397872", + "url": "https://edge.forgecdn.net/files/7401/392/greate-0.0.60.jar", + "id": "7401392", "parent_id": "901996", "hashes": { - "sha1": "dc87ce9d17abc7967e26aac5d9e3480d4e36c7d1", - "md5": "80f5d8e86c6d52f34308214b19ac98ea" + "sha1": "3fc325df338f275847344f553ad81c3e9be0bc80", + "md5": "f521d8a849e0a56b5ba2051a81bb684d" }, "required_dependencies": [ - "890405", - "328085" + "328085", + "890405" ], - "size": 1252913, - "date_published": "2025-12-30T21:34:45.940Z" + "size": 1253032, + "date_published": "2025-12-31T17:41:00.300Z" } ] },