diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e074afbf..9aed3cc50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Cleaning meal bag foil packs is now done in the chem bath instead of the ore washer. @Pyritie - Turning honey into sugar is now done in the extractor instead of the centrifuge. @Pyritie - Syngas crafting in the Vacuum Chamber will now output into the chamber itself instead of the Basin, so it won't get mixed up with the creosote (#2378) @Pyritie +- Cleaned up the EMI pages for small and large boilers so they aren't flooded with furniture and other things. If you were using something "non-standard" to fuel your boilers, check if they're still valid. (#2421, #2415) @thederpysockdude123 @applenper +- Clay dust is no longer electrolyzable, but now you can get infinite clay blocks from a rock breaker @Pyritie ### Changes #### Hot or Not - Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `#tfg:hot_protection_equipment`, `#tfg:cold_protection_equipment`, and `#tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. The equipment also protects against pipes! @Pyritie @@ -30,6 +32,7 @@ - Added some more ruined structures with a small bit of loot. - Added some resource packs for TFC, disabled by default - Lenses are now allowed on tool racks (#2434) @thederpysockdude123 +- The Active Transformer multiblock is now craftable at EV, with a new texture and casings. (#2424) @BlueBoat29 ### Bug fixes - Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie - Fixed fries and cheese curds not being able to be put on burgers. @Redeix @@ -41,8 +44,10 @@ - Fixed a recipe conflict for boiled and fried eggs (#2407) @Mqrius - Fixed a recipe conflict blocking the crafting of silicone rubber (#2387) @Mqrius - Fixed the backpack and QuarkTech helmet auto-feeding from feeding you while you're downed @Mqrius +- Fixed drills taking way more damage when mining than intended (#2419, #2428) @Mqrius - Fixed Ostrum Casing not having a recipe (#2363) @FlightingFalcon - Fixed warped trees not growing on normal mars dirt @Pyritie +- Fixed missing block names for some of the variations of non-earth stones @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Japanese @sakura-gondra diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index aec60da07..51fd94b9d 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -251,20 +251,24 @@ "block.tfg.rock.aqueduct_nether": "Keratophyre Aqueduct", "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite", "block.tfg.rock.moon_stone_wall": "Raw Anorthosite Wall", - "block.tfg.rock.cobble_moon_stone_wall": "Anorthosite Cobble Wall", + "block.tfg.rock.cobble_moon_wall": "Anorthosite Cobble Wall", "block.tfg.rock.mossy_cobble_moon": "Anorthosite Mossy Cobble", "block.tfg.rock.mossy_cobble_moon_stairs": "Anorthosite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_moon_slab": "Anorthosite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_moon_wall": "Anorthosite Mossy Cobble Wall", - "block.tfg.rock.mossy_bricks_moon_stone": "Mossy Anorthosite Bricks", - "block.tfg.rock.mossy_bricks_moon_stone_stairs": "Mossy Anorthosite Brick Stairs", - "block.tfg.rock.mossy_bricks_moon_stone_slab": "Mossy Anorthosite Brick Slab", - "block.tfg.rock.mossy_bricks_moon_stone_wall": "Mossy Anorthosite Brick Wall", + "block.tfg.rock.mossy_bricks_moon": "Mossy Anorthosite Bricks", + "block.tfg.rock.mossy_bricks_moon_stairs": "Mossy Anorthosite Brick Stairs", + "block.tfg.rock.mossy_bricks_moon_slab": "Mossy Anorthosite Brick Slab", + "block.tfg.rock.mossy_bricks_moon_wall": "Mossy Anorthosite Brick Wall", "block.tfg.rock.chiseled_bricks_moon_wall": "Chiseled Anorthosite Wall", "block.tfg.rock.gravel_moon": "Anorthosite Gravel", "block.tfg.spike.moon_stone_spike": "Anorthosite Spike", "block.tfg.loose.moon_stone": "Loose Anorthosite Rock", "block.tfg.rock.aqueduct_moon_stone": "Anorthosite Aqueduct", + "block.tfg.rock.polished_moon_wall": "Polished Anorthosite Wall", + "block.tfg.rock.cracked_bricks_moon_stairs": "Cracked Anorthosite Brick Stairs", + "block.tfg.rock.cracked_bricks_moon_slab": "Cracked Anorthosite Brick Slab", + "block.tfg.rock.cracked_bricks_moon_wall": "Cracked Anorthosite Brick Wall", "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite", "block.tfg.rock.moon_deepslate_stairs": "Raw Norite Stairs", "block.tfg.rock.moon_deepslate_slab": "Raw Norite Slab", @@ -298,19 +302,25 @@ "block.tfg.spike.moon_deepslate_spike": "Norite Spike", "block.tfg.loose.moon_deepslate": "Loose Norite Rock", "block.tfg.rock.aqueduct_moon_deepslate": "Norite Aqueduct", + "block.tfg.rock.mossy_bricks_moon_deepslate": "Mossy Norite Bricks", + "block.tfg.rock.mossy_bricks_moon_deepslate_stairs": "Mossy Norite Brick Stairs", + "block.tfg.rock.mossy_bricks_moon_deepslate_slab": "Mossy Norite Brick Slab", + "block.tfg.rock.mossy_bricks_moon_deepslate_wall": "Mossy Norite Brick Wall", "block.tfg.rock.hardened_mars_stone": "Hardened Argillite", "block.tfg.rock.mars_stone_wall": "Raw Argillite Wall", - "block.tfg.rock.cobble_mars_stone_wall": "Argillite Cobble Wall", + "block.tfg.rock.cobble_mars_wall": "Argillite Cobble Wall", "block.tfg.rock.mossy_cobble_mars": "Argillite Mossy Cobble", "block.tfg.rock.mossy_cobble_mars_stairs": "Argillite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_mars_slab": "Argillite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_mars_wall": "Argillite Mossy Cobble Wall", "block.tfg.rock.polished_mars_wall": "Polished Argillite Wall", - "block.tfg.rock.mossy_bricks_mars_stone": "Mossy Argillite Bricks", - "block.tfg.rock.mossy_bricks_mars_stone_stairs": "Mossy Argillite Brick Stairs", - "block.tfg.rock.mossy_bricks_mars_stone_slab": "Mossy Argillite Brick Slab", - "block.tfg.rock.mossy_bricks_mars_stone_wall": "Mossy Argillite Brick Wall", - "block.tfg.rock.cracked_bricks_mars_stone_wall": "Cracked Argillite Brick Wall", + "block.tfg.rock.mossy_bricks_mars": "Mossy Argillite Bricks", + "block.tfg.rock.mossy_bricks_mars_stairs": "Mossy Argillite Brick Stairs", + "block.tfg.rock.mossy_bricks_mars_slab": "Mossy Argillite Brick Slab", + "block.tfg.rock.mossy_bricks_mars_wall": "Mossy Argillite Brick Wall", + "block.tfg.rock.cracked_bricks_mars_stairs": "Cracked Argillite Brick Stairs", + "block.tfg.rock.cracked_bricks_mars_slab": "Cracked Argillite Brick Slab", + "block.tfg.rock.cracked_bricks_mars_wall": "Cracked Argillite Brick Wall", "block.tfg.rock.chiseled_bricks_mars_wall": "Chiseled Argillite Wall", "block.tfg.rock.gravel_mars": "Argillite Gravel", "block.tfg.spike.mars_stone_spike": "Argillite Spike", @@ -318,17 +328,19 @@ "block.tfg.rock.aqueduct_mars_stone": "Argillite Aqueduct", "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte", "block.tfg.rock.venus_stone_wall": "Raw Trachyte Wall", - "block.tfg.rock.cobble_venus_stone_wall": "Trachyte Cobble Wall", + "block.tfg.rock.cobble_venus_wall": "Trachyte Cobble Wall", "block.tfg.rock.mossy_cobble_venus": "Trachyte Mossy Cobble", "block.tfg.rock.mossy_cobble_venus_stairs": "Trachyte Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_venus_slab": "Trachyte Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_venus_wall": "Trachyte Mossy Cobble Wall", "block.tfg.rock.polished_venus_wall": "Polished Trachyte Wall", - "block.tfg.rock.mossy_bricks_venus_stone": "Mossy Trachyte Bricks", - "block.tfg.rock.mossy_bricks_venus_stone_stairs": "Mossy Trachyte Brick Stairs", - "block.tfg.rock.mossy_bricks_venus_stone_slab": "Mossy Trachyte Brick Slab", - "block.tfg.rock.mossy_bricks_venus_stone_wall": "Mossy Trachyte Brick Wall", - "block.tfg.rock.cracked_bricks_venus_stone_wall": "Cracked Trachyte Brick Wall", + "block.tfg.rock.mossy_bricks_venus": "Mossy Trachyte Bricks", + "block.tfg.rock.mossy_bricks_venus_stairs": "Mossy Trachyte Brick Stairs", + "block.tfg.rock.mossy_bricks_venus_slab": "Mossy Trachyte Brick Slab", + "block.tfg.rock.mossy_bricks_venus_wall": "Mossy Trachyte Brick Wall", + "block.tfg.rock.cracked_bricks_venus_stairs": "Cracked Trachyte Brick Stairs", + "block.tfg.rock.cracked_bricks_venus_slab": "Cracked Trachyte Brick Slab", + "block.tfg.rock.cracked_bricks_venus_wall": "Cracked Trachyte Brick Wall", "block.tfg.rock.chiseled_bricks_venus_wall": "Chiseled Trachyte Wall", "block.tfg.rock.gravel_venus": "Trachyte Gravel", "block.tfg.spike.venus_stone_spike": "Trachyte Spike", @@ -336,17 +348,19 @@ "block.tfg.rock.aqueduct_venus_stone": "Trachyte Aqueduct", "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite", "block.tfg.rock.mercury_stone_wall": "Raw Komatiite Wall", - "block.tfg.rock.cobble_mercury_stone_wall": "Komatiite Cobble Wall", + "block.tfg.rock.cobble_mercury_wall": "Komatiite Cobble Wall", "block.tfg.rock.mossy_cobble_mercury": "Komatiite Mossy Cobble", "block.tfg.rock.mossy_cobble_mercury_stairs": "Komatiite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_mercury_slab": "Komatiite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_mercury_wall": "Komatiite Mossy Cobble Wall", "block.tfg.rock.polished_mercury_wall": "Polished Komatiite Wall", - "block.tfg.rock.mossy_bricks_mercury_stone": "Mossy Komatiite Bricks", - "block.tfg.rock.mossy_bricks_mercury_stone_stairs": "Mossy Komatiite Brick Stairs", - "block.tfg.rock.mossy_bricks_mercury_stone_slab": "Mossy Komatiite Brick Slab", - "block.tfg.rock.mossy_bricks_mercury_stone_wall": "Mossy Komatiite Brick Wall", - "block.tfg.rock.cracked_bricks_mercury_stone_wall": "Cracked Komatiite Brick Wall", + "block.tfg.rock.mossy_bricks_mercury": "Mossy Komatiite Bricks", + "block.tfg.rock.mossy_bricks_mercury_stairs": "Mossy Komatiite Brick Stairs", + "block.tfg.rock.mossy_bricks_mercury_slab": "Mossy Komatiite Brick Slab", + "block.tfg.rock.mossy_bricks_mercury_wall": "Mossy Komatiite Brick Wall", + "block.tfg.rock.cracked_bricks_mercury_stairs": "Cracked Komatiite Brick Stairs", + "block.tfg.rock.cracked_bricks_mercury_slab": "Cracked Komatiite Brick Slab", + "block.tfg.rock.cracked_bricks_mercury_wall": "Cracked Komatiite Brick Wall", "block.tfg.rock.chiseled_bricks_mercury_wall": "Chiseled Komatiite Wall", "block.tfg.rock.gravel_mercury": "Komatiite Gravel", "block.tfg.spike.mercury_stone_spike": "Komatiite Spike", @@ -354,17 +368,19 @@ "block.tfg.rock.aqueduct_mercury_stone": "Komatiite Aqueduct", "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite", "block.tfg.rock.glacio_stone_wall": "Raw Phonolite Wall", - "block.tfg.rock.cobble_glacio_stone_wall": "Phonolite Cobble Wall", + "block.tfg.rock.cobble_glacio_wall": "Phonolite Cobble Wall", "block.tfg.rock.mossy_cobble_glacio": "Phonolite Mossy Cobble", "block.tfg.rock.mossy_cobble_glacio_stairs": "Phonolite Mossy Cobble Stairs", "block.tfg.rock.mossy_cobble_glacio_slab": "Phonolite Mossy Cobble Slab", "block.tfg.rock.mossy_cobble_glacio_wall": "Phonolite Mossy Cobble Wall", "block.tfg.rock.polished_glacio_wall": "Polished Phonolite Wall", - "block.tfg.rock.mossy_bricks_glacio_stone": "Mossy Phonolite Bricks", - "block.tfg.rock.mossy_bricks_glacio_stone_stairs": "Mossy Phonolite Brick Stairs", - "block.tfg.rock.mossy_bricks_glacio_stone_slab": "Mossy Phonolite Brick Slab", - "block.tfg.rock.mossy_bricks_glacio_stone_wall": "Mossy Phonolite Brick Wall", - "block.tfg.rock.cracked_bricks_glacio_stone_wall": "Cracked Phonolite Brick Wall", + "block.tfg.rock.mossy_bricks_glacio": "Mossy Phonolite Bricks", + "block.tfg.rock.mossy_bricks_glacio_stairs": "Mossy Phonolite Brick Stairs", + "block.tfg.rock.mossy_bricks_glacio_slab": "Mossy Phonolite Brick Slab", + "block.tfg.rock.mossy_bricks_glacio_wall": "Mossy Phonolite Brick Wall", + "block.tfg.rock.cracked_bricks_glacio_stairs": "Cracked Phonolite Brick Stairs", + "block.tfg.rock.cracked_bricks_glacio_slab": "Cracked Phonolite Brick Slab", + "block.tfg.rock.cracked_bricks_glacio_wall": "Cracked Phonolite Brick Wall", "block.tfg.rock.chiseled_bricks_glacio_wall": "Chiseled Phonolite Wall", "block.tfg.rock.gravel_glacio": "Phonolite Gravel", "block.tfg.spike.glacio_stone_spike": "Phonolite Spike", @@ -378,15 +394,19 @@ "block.tfg.rock.cobble_permafrost_stairs": "Permafrost Cobble Stairs", "block.tfg.rock.cobble_permafrost_slab": "Permafrost Cobble Slab", "block.tfg.rock.cobble_permafrost_wall": "Permafrost Cobble Wall", - "block.tfg.rock.mossy_cobble_permafrost_stairs": "Permafrost Mossy Cobble Stairs", - "block.tfg.rock.mossy_cobble_permafrost_slab": "Permafrost Mossy Cobble Slab", - "block.tfg.rock.mossy_cobble_permafrost_wall": "Permafrost Mossy Cobble Wall", + "block.tfg.rock.mossy_cobble_permafrost": "Mossy Cobble Permafrost", + "block.tfg.rock.mossy_cobble_permafrost_stairs": "Mossy Cobble Permafrost Stairs", + "block.tfg.rock.mossy_cobble_permafrost_slab": "Mossy Cobble Permafrost Slab", + "block.tfg.rock.mossy_cobble_permafrost_wall": "Mossy Cobble Permafrost Wall", "block.tfg.rock.polished_permafrost_wall": "Polished Permafrost Wall", "block.tfg.rock.mossy_bricks_permafrost": "Mossy Permafrost Bricks", "block.tfg.rock.mossy_bricks_permafrost_stairs": "Mossy Permafrost Brick Stairs", "block.tfg.rock.mossy_bricks_permafrost_slab": "Mossy Permafrost Brick Slab", "block.tfg.rock.mossy_bricks_permafrost_wall": "Mossy Permafrost Brick Wall", - "block.tfg.rock.cracked_bricks_permafrost_stone_wall": "Cracked Permafrost Brick Wall", + "block.tfg.rock.cracked_bricks_permafrost_stairs": "Cracked Permafrost Brick Stairs", + "block.tfg.rock.cracked_bricks_permafrost_slab": "Cracked Permafrost Brick Slab", + "block.tfg.rock.cracked_bricks_permafrost_wall": "Cracked Permafrost Brick Wall", + "block.tfg.rock.chiseled_bricks_permafrost_wall": "Chiseled Permafrost Wall", "block.tfg.rock.gravel_permafrost": "Permafrost Gravel", "block.tfg.spike.permafrost_spike": "Permafrost Spike", "block.tfg.loose.permafrost": "Loose Permafrost Rock", @@ -425,13 +445,21 @@ "block.tfg.rock.cracked_bricks_stone_wall": "Cracked Reconstituted Stone Brick Wall", "block.tfg.rock.aqueduct_stone": "Reconstituted Stone Aqueduct", "block.tfg.rock.smooth_red_sandstone_wall": "Smooth Hematitic Sandstone Wall", + "block.tfg.rock.cut_red_sandstone_stairs": "Cut Hematitic Sandstone Stairs", "block.tfg.rock.cut_red_sandstone_wall": "Cut Hematitic Sandstone Wall", + "block.tfg.rock.bricks_venus_sandstone_wall": "Trachyte Sandstone Brick Wall", + "block.tfg.rock.cracked_bricks_venus_sandstone_stairs": "Cracked Trachyte Sandstone Brick Stairs", + "block.tfg.rock.cracked_bricks_venus_sandstone_slab": "Cracked Trachyte Sandstone Brick Slab", + "block.tfg.rock.cracked_bricks_venus_sandstone_wall": "Cracked Trachyte Sandstone Brick Wall", + "block.tfg.rock.quartz_wall": "Quartz Wall", + "block.tfg.rock.smooth_quartz_wall": "Smooth Quartz Wall", "block.tfg.rock.raw.stromatolite": "Raw Stromatolite", "block.tfg.rock.spike.stromatolite": "Stromatolite Spike", "block.tfg.stromatolite_cluster_small": "Small Stromatolite Cluster", "block.tfg.stromatolite_cluster_medium": "Large Stromatolite Cluster", "block.tfg.rock.raw.geyserite": "Raw Geyserite", "block.tfg.rock.spike.geyserite": "Geyserite Spike", + "block.tfg.rock.halite": "Halite", "block.tfg.mushroom_roots": "Mushroom Roots", "block.tfg.mushroom_sprouts": "Mushroom Sprouts", "block.tfg.charred_log": "Charred Log", diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js index f805affa3..e753c0c09 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.stone_dusts.js @@ -6,13 +6,6 @@ */ function registerTFGStoneDustRecipes(event) { - event.recipes.gtceu.electrolyzer('gtceu:decomposition_electrolyzing_clay') - .itemInputs('13x #forge:dusts/clay') - .itemOutputs('2x #forge:dusts/sodium', '1x #forge:dusts/lithium', '2x #forge:dusts/aluminium', '2x #forge:dusts/silicon') - .outputFluids(Fluid.of('minecraft:water', 6000)) - .duration(GTMaterials.Clay.getMass() * 13) - .EUt(GTValues.VA[GTValues.HV]) - event.recipes.gtceu.centrifuge('gtceu:stone_dust_separation') .itemInputs('gtceu:stone_dust') .chancedOutput('#forge:small_dusts/quartzite', 2500, 0) diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 153455c8a..77a6c3a86 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -141,4 +141,15 @@ function registerTFGClayRecipes(event) { .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) + + // Renewable clay + + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_clay' }) + + event.recipes.gtceu.rock_breaker("clay_duping") + .notConsumable('minecraft:clay') + .itemOutputs('minecraft:clay') + .adjacentFluids(["tfc:salt_water", "tfc:spring_water"]) + .duration(50) + .EUt(GTValues.VHA[GTValues.MV]) } \ No newline at end of file