From d8b5cdf8ff4dfb74890c01bdfbe115618280b7f9 Mon Sep 17 00:00:00 2001 From: Mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Fri, 24 May 2024 18:04:49 +0200 Subject: [PATCH] Release prep for 1.2.3.a (#1318) * chore: move dependencies.gradle to root dir * run datagen * chore: version & changelog --------- Co-authored-by: screret <68943070+screret@users.noreply.github.com> --- CHANGELOG.md | 27 +++++++------------ build.gradle | 2 +- ...dependencies.gradle => dependencies.gradle | 0 gradle.properties | 2 +- .../resources/assets/gtceu/lang/en_ud.json | 4 +++ .../resources/assets/gtceu/lang/en_us.json | 4 +++ 6 files changed, 19 insertions(+), 20 deletions(-) rename gradle/scripts/dependencies.gradle => dependencies.gradle (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4cac6c85d..80d180a90d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,17 @@ # ChangeLog -Version: 1.2.3 +Version: 1.2.3.a ### ADDITIONS: -- Custom coil tiers are now displayed in JEI and displayed on separate lines to the temperature. -- Turbines now hurt the player when running. -- Added in-world oil spouts. -- Made fluid pipes display the fluid contents when using Jade/TOP. -- Added hazmat armor and added various debuff effects. - - asbestos is now a breathing hazard, uranium is radioactive to touch, etc. +- Added in-world machine configuration using tools +- Active Transformers now explode when they're being mined while transferring energy + - A new `harmlessActiveTransformers` config option was added to optionally disable this feature ### CHANGES: -- Reworked rotor stats by moving efficiency to its own parameter. - - PACK/ADDON DEVS NEED TO CHANGE THEIR ROTOR PROPERTIES -- Number formatting for duration and eu values in JEI. ### FIXES: -- Fixed all pipe blocks being washed away by any fluid. -- Made active overlay textures actually render on machines when running or paused. -- Fixed QuarkTech armor consuming lunchboxes and other "foods" that don't get consumed immediately. -- Fixed various ore smelting recipes were added. -- Fixed GT armors no longer take durability damage. -- Updated ru and tw translations. -- Fixed laser hatches now save the energy between world loads. -- Fixed dense plates requiring ingots to craft. +- Fixed steam miners not using steam +- Fixed emerald/beryllium derivate toxicity +- Increased performance for unification entry lookups in larger modpacks +- Fixed steam ovens not parallelizing +- Fixed bedrock ore veins not being registered \ No newline at end of file diff --git a/build.gradle b/build.gradle index 516848661b..77d4a1eef6 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ version = "${mod_version}" + (buildNumber != null ? "-build_${System.getenv("GIT apply from: "$rootDir/gradle/scripts/architectury_loom.gradle" apply from: "$rootDir/gradle/scripts/capabilities.gradle" apply from: "$rootDir/gradle/scripts/repositories.gradle" -apply from: "$rootDir/gradle/scripts/dependencies.gradle" +apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/gradle/scripts/resources.gradle" apply from: "$rootDir/gradle/scripts/jars.gradle" apply from: "$rootDir/gradle/scripts/publishing.gradle" diff --git a/gradle/scripts/dependencies.gradle b/dependencies.gradle similarity index 100% rename from gradle/scripts/dependencies.gradle rename to dependencies.gradle diff --git a/gradle.properties b/gradle.properties index dec1ae1e41..0daafe649c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G # Mod Info mod_id = gtceu mod_name = GregTech -mod_version = 1.2.3 +mod_version = 1.2.3.a mod_description = GregTech CE Unofficial, ported from 1.12.2 mod_license = LGPL-3.0 license mod_url = https://github.com/GregTechCEu/GregTech-Modern/ diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 2fcd7a8086..027b85f1b6 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3246,6 +3246,9 @@ "gtceu.maintenance.configurable_time.changed_description": "˙ǝʇɐɹ ןɐɯɹou ǝɥʇ xɟ% ʇɐ ɹnɔɔo ןןıʍ sɯǝןqoɹd ǝɔuɐuǝʇuıɐW", "gtceu.maintenance.configurable_time.unchanged_description": "˙ǝʇɐpdn oʇ uoıʇɐɹnbıɟuoɔ ǝbuɐɥƆ ˙ǝʇɐɹ ןɐɯɹou ʇɐ ɹnɔɔo ןןıʍ sɯǝןqoɹd ǝɔuɐuǝʇuıɐW", "gtceu.mixer": "ɹǝxıW", + "gtceu.mode.both": "ɹ§)ɯǝʇI puⱯ pınןℲ( ɥʇoᗺp§", + "gtceu.mode.fluid": "ɹ§pınןℲ6§", + "gtceu.mode.item": "ɹ§ɯǝʇI9§", "gtceu.muffler.recovery_tooltip": "%d%%ɟ§ :ǝɔuɐɥƆ ʎɹǝʌoɔǝᴚq§", "gtceu.multiblock.advanced_processing_array.description": "˙uoıʇɐɯoʇnɐ buısɐǝ ʎןǝʌıʇɔǝɟɟǝ 'ʞɔoןqıʇןnɯ ǝןbuıs ɐ uı )s(ǝuıɥɔɐɯ ʞɔoןq ǝןbuıs ㄣ9 oʇ dn sǝuıqɯoɔ ʎɐɹɹⱯ buıssǝɔoɹԀ ǝɥ⟘", "gtceu.multiblock.assembly_line.description": "˙sʇuǝuodɯoɔ buıʇɟɐɹɔ pǝɔuɐʌpɐ buıʇɐǝɹɔ ɹoɟ pǝsn 'ǝuıɥɔɐW buıןqɯǝssⱯ ǝbɹɐן s,ʇı 'ʎɹoǝɥʇ uI ˙\"sǝɔıןs\" 9Ɩ oʇ ϛ ɟo buıʇsısuoɔ ǝɹnʇɔnɹʇs ʞɔoןqıʇןnɯ ǝbɹɐן ɐ sı ǝuıꞀ ʎןqɯǝssⱯ ǝɥ⟘", @@ -5328,6 +5331,7 @@ "metaitem.generic.fluid_container.tooltip": "%s Ꞁ%d/%d", "metaitem.int_circuit.configuration": "%d :uoıʇɐɹnbıɟuoƆ", "metaitem.liquid_fuel_jetpack.tooltip": "ʇsnɹɥ⟘ ɹoɟ sןǝnℲ ɹoʇɐɹǝuǝ⅁ uoıʇsnqɯoƆ sǝs∩", + "metaitem.machine_configuration.mode": "%s ɹ§:ǝpoW uoıʇɐɹnbıɟuoƆɐ§", "metaitem.plugin.proxy.tooltips.1": ")uǝǝɹɔs ǝɥʇ uı ǝpoɯ ʎxoɹd oʇ ʇsnظpɐ ǝsɐǝןԀ(", "metaitem.plugin.tooltips.1": "˙ʎʇıןɐuoıʇɔunɟ ǝɹoɯ ɹoɟ uǝǝɹɔs ǝɥʇ oʇ pǝppɐ ǝq uɐɔ suıbnןԀ", "metaitem.prospector.mode.bedrock_ore": "ɹ§ǝpoW uoıʇɔǝdsoɹԀ ǝɹO ʞɔoɹpǝᗺq§", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 593725362d..4913feaaee 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3246,6 +3246,9 @@ "gtceu.maintenance.configurable_time.changed_description": "Maintenance problems will occur at %fx the normal rate.", "gtceu.maintenance.configurable_time.unchanged_description": "Maintenance problems will occur at normal rate. Change configuration to update.", "gtceu.mixer": "Mixer", + "gtceu.mode.both": "§dBoth (Fluid And Item)§r", + "gtceu.mode.fluid": "§9Fluid§r", + "gtceu.mode.item": "§6Item§r", "gtceu.muffler.recovery_tooltip": "§bRecovery Chance: §f%d%%", "gtceu.multiblock.advanced_processing_array.description": "The Processing Array combines up to 64 single block machine(s) in a single multiblock, effectively easing automation.", "gtceu.multiblock.assembly_line.description": "The Assembly Line is a large multiblock structure consisting of 5 to 16 \"slices\". In theory, it's large Assembling Machine, used for creating advanced crafting components.", @@ -5328,6 +5331,7 @@ "metaitem.generic.fluid_container.tooltip": "%d/%dL %s", "metaitem.int_circuit.configuration": "Configuration: %d", "metaitem.liquid_fuel_jetpack.tooltip": "Uses Combustion Generator Fuels for Thrust", + "metaitem.machine_configuration.mode": "§aConfiguration Mode:§r %s", "metaitem.plugin.proxy.tooltips.1": "(Please adjust to proxy mode in the screen)", "metaitem.plugin.tooltips.1": "Plugins can be added to the screen for more functionality.", "metaitem.prospector.mode.bedrock_ore": "§bBedrock Ore Prospection Mode§r",