Band-aid fix and run Datagen

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1,4 +1,5 @@
 {
+    "argument.medical_condition.id.invalid": "%s uoıʇıpuoɔ ןɐɔıpǝɯ uʍouʞu∩",
     "bedrock_fluid.gtceu.heavy_oil_deposit": "ʇısodǝᗡ ןıO ʎʌɐǝH",
     "bedrock_fluid.gtceu.lava_deposit": "ʇısodǝᗡ ɐʌɐꞀ",
     "bedrock_fluid.gtceu.light_oil_deposit": "ʇısodǝᗡ ןıO ʇɥbıꞀ",
@@ -936,9 +937,6 @@
     "block.gtceu.normal_optical_pipe.tooltip": "ㄥ§ɐʇɐᗡ ɥɔɹɐǝsǝᴚɟ§ ɹo ㄥ§uoıʇɐʇndɯoƆɟ§ buıʇʇıɯsuɐɹ⟘ㄥ§",
     "block.gtceu.object_holder": "ɹǝpןoH ʇɔǝظqO",
     "block.gtceu.oil": "ןıO",
-    "block.gtceu.oil_heavy": "ןıO ʎʌɐǝH",
-    "block.gtceu.oil_light": "ןıO ʇɥbıꞀ",
-    "block.gtceu.oil_medium": "ןıO ʍɐᴚ",
     "block.gtceu.opv_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɹ§Ɐǝ§ㄣᄅ0'Ɩ ɹ§ΛdOן§6§",
     "block.gtceu.opv_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɹ§Ɐǝ§ㄣᄅ0'Ɩ ɹ§ΛdOן§6§",
     "block.gtceu.opv_16a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§9Ɩ ɹ§ΛdOן§6§",
@@ -1153,6 +1151,7 @@
     "block.gtceu.substation_capacitor.tooltip_empty": "uoıʇɐʇsqnS ɹǝʍoԀ ɹnoʎ uı ǝɔɐds buıןןıɟ ɹoℲㄥ§",
     "block.gtceu.substation_capacitor.tooltip_filled": "∩Ǝ %dɟ§ :ʎʇıɔɐdɐƆ ʎbɹǝuƎɔ§",
     "block.gtceu.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS",
+    "block.gtceu.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s",
     "block.gtceu.tempered_glass": "ssɐן⅁ pǝɹǝdɯǝ⟘",
     "block.gtceu.test_mui": "ınW ʇsǝ⟘",
     "block.gtceu.the_end_marker": "puƎ ǝɥ⟘",
@@ -1743,7 +1742,6 @@
     "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ɹ§ǝbɐʇןoΛ WԀZɔ§",
     "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§",
     "block.gtceu.zpm_world_accelerator": "ɹ§III ɹoʇɐɹǝןǝɔɔⱯ pןɹoM ǝʇıןƎɔ§",
-    "block.gtceu.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s",
     "button.gtceu.mark_as_depleted.name": "pǝʇǝןdǝᗡ sɐ ʞɹɐW",
     "button.gtceu.toggle_waypoint.name": "ʇuıodʎɐM ǝןbbo⟘",
     "command.gtceu.cape.failure.does_not_exist": "ʇsıxǝ ʇou sǝop %s ǝdɐƆ",
@@ -1981,6 +1979,7 @@
     "config.jade.plugin_gtceu.ldp_endpoint": "oɟuI ʇuıodpuƎ ǝuıןǝdıԀ ǝɔuɐʇsıᗡ buoꞀ ]nƎƆ⟘⅁[",
     "config.jade.plugin_gtceu.machine_mode": "ǝpoW ǝuıɥɔɐW ]nƎƆ⟘⅁[",
     "config.jade.plugin_gtceu.maintenance_info": "oɟuI ǝɔuɐuǝʇuıɐW ]nƎƆ⟘⅁[",
+    "config.jade.plugin_gtceu.me_grid_connected": "oɟuI ǝuıɥɔɐW pǝʇɔǝuuoƆ pıɹ⅁ ]nƎƆ⟘⅁[",
     "config.jade.plugin_gtceu.me_pattern_buffer": "oɟuI ɹǝɟɟnᗺ uɹǝʇʇɐԀ ]nƎƆ⟘⅁[",
     "config.jade.plugin_gtceu.me_pattern_buffer_proxy": "oɟuI ʎxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ ]nƎƆ⟘⅁[",
     "config.jade.plugin_gtceu.multiblock_structure": "ǝɹnʇɔnɹʇS ʞɔoןᗺıʇןnW ]nƎƆ⟘⅁[",
@@ -2552,7 +2551,7 @@
     "gtceu.item_pipe.priority": "%dɟ§ :ʎʇıɹoıɹԀ6§",
     "gtceu.jade.amperage_use": "Ɐ %s",
     "gtceu.jade.at": " @ ",
-    "gtceu.jade.changes_eu_sec": "s/∩Ǝ %s",
+    "gtceu.jade.changes_eu_tick": "ʇ/∩Ǝ %s",
     "gtceu.jade.cleaned_this_second": "s/%s :pɹɐzɐɥ pǝuɐǝןƆ",
     "gtceu.jade.days": "sʎɐp %s",
     "gtceu.jade.energy_stored": "∩Ǝ %d / %d",
@@ -2629,8 +2628,8 @@
     "gtceu.machine.available_recipe_map_4.tooltip": "%s '%s '%s '%s :sǝdʎ⟘ ǝdıɔǝᴚ ǝןqɐןıɐʌⱯ",
     "gtceu.machine.basic.input_from_output_side.allow": " :ǝpıS ʇndʇnO ɯoɹɟ ʇnduI ʍoןןⱯ",
     "gtceu.machine.basic.input_from_output_side.disallow": " :ǝpıS ʇndʇnO ɯoɹɟ ʇnduI ʍoןןɐsıᗡ",
-    "gtceu.machine.batch_disabled": "pǝןqɐsıᗡ buıɥɔʇɐᗺ",
-    "gtceu.machine.batch_enabled": "pǝןqɐuƎ buıɥɔʇɐᗺ",
+    "gtceu.machine.batching.disabled": "pǝןqɐsıᗡ buıɥɔʇɐᗺ",
+    "gtceu.machine.batching.enabled": "pǝןqɐuƎ buıɥɔʇɐᗺ",
     "gtceu.machine.bedrock_ore_miner.depletion": "%s%%ɟ§ :ǝʇɐᴚ uoıʇǝןdǝᗡq§",
     "gtceu.machine.bedrock_ore_miner.description": "˙ʞɔoɹpǝq ɹǝpun suıǝʌ ɯoɹɟ sǝɹo sןןıɹᗡㄥ§",
     "gtceu.machine.bedrock_ore_miner.production": "pǝʞɔoןɔɹǝʌo xɟ% 'x%dɟ§ :ɹǝıןdıʇןnW uoıʇɔnpoɹԀǝ§",
@@ -2883,8 +2882,8 @@
     "gtceu.machine.large_boiler.tungstensteel.tooltip": "¿buıɥʇ sıɥʇ ןǝnɟ uǝʌǝ noʎ op ʍoH",
     "gtceu.machine.large_chemical_reactor.tooltip": "ɹoʇɔɐǝᴚ xoᗺ ʞɔɐןᗺ",
     "gtceu.machine.large_combustion_engine.tooltip": "ɹǝqɯɐɥƆ uoıʇıubI ןǝnℲ",
-    "gtceu.machine.large_combustion_engine.tooltip.boost_extreme": "˙uoıʇdɯnsuoɔ ןǝnɟ ㄥ§xᄅɟ§ ʇɐ ㄥ§ʇ/∩Ǝ %sɟ§ oʇ dn ǝɔnpoɹd oʇ uǝbʎxO pınbıꞀ ɟo ㄥ§s/ᗺɯ 08ɟ§ ʎןddnS",
-    "gtceu.machine.large_combustion_engine.tooltip.boost_regular": "˙uoıʇdɯnsuoɔ ןǝnɟ ㄥ§xᄅɟ§ ʇɐ ㄥ§ʇ/∩Ǝ %sɟ§ oʇ dn ǝɔnpoɹd oʇ uǝbʎxO ɟo ㄥ§s/ᗺɯ 0ᄅɟ§ ʎןddnS",
+    "gtceu.machine.large_combustion_engine.tooltip.boost_extreme": "˙uoıʇdɯnsuoɔ ןǝnɟ ㄥ§xᄅɟ§ ʇɐ ㄥ§ʇ/∩Ǝ %sɟ§ oʇ dn ǝɔnpoɹd oʇ ㄥ§uǝbʎxO pınbıꞀ6§ ɟo ㄥ§s/ᗺɯ 08ɟ§ ʎןddnS",
+    "gtceu.machine.large_combustion_engine.tooltip.boost_regular": "˙uoıʇdɯnsuoɔ ןǝnɟ ㄥ§xᄅɟ§ ʇɐ ㄥ§ʇ/∩Ǝ %sɟ§ oʇ dn ǝɔnpoɹd oʇ ㄥ§uǝbʎxOq§ ɟo ㄥ§s/ᗺɯ 0ᄅɟ§ ʎןddnS",
     "gtceu.machine.large_miner.ev.tooltip": "noʎ ɟo pɐǝʇsuı ǝɹO buıbbıᗡ",
     "gtceu.machine.large_miner.iv.tooltip": "ɹoʇɐʌɐɔxƎ ǝɯoıᗺ",
     "gtceu.machine.large_miner.luv.tooltip": "ɹǝʇsǝʌɹɐH ןɐıɹʇsǝɹɹǝ⟘",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1,4 +1,5 @@
 {
+    "argument.medical_condition.id.invalid": "Unknown medical condition %s",
     "bedrock_fluid.gtceu.heavy_oil_deposit": "Heavy Oil Deposit",
     "bedrock_fluid.gtceu.lava_deposit": "Lava Deposit",
     "bedrock_fluid.gtceu.light_oil_deposit": "Light Oil Deposit",
@@ -936,9 +937,6 @@
     "block.gtceu.normal_optical_pipe.tooltip": "§7Transmitting §fComputation§7 or §fResearch Data§7",
     "block.gtceu.object_holder": "Object Holder",
     "block.gtceu.oil": "Oil",
-    "block.gtceu.oil_heavy": "Heavy Oil",
-    "block.gtceu.oil_light": "Light Oil",
-    "block.gtceu.oil_medium": "Raw Oil",
     "block.gtceu.opv_1024a_laser_source_hatch": "§9§lOpV§r 1,024§eA§r Laser Source Hatch",
     "block.gtceu.opv_1024a_laser_target_hatch": "§9§lOpV§r 1,024§eA§r Laser Target Hatch",
     "block.gtceu.opv_16a_energy_converter": "§9§lOpV§r 16§eA§r Energy Converter",
@@ -1153,6 +1151,7 @@
     "block.gtceu.substation_capacitor.tooltip_empty": "§7For filling space in your Power Substation",
     "block.gtceu.substation_capacitor.tooltip_filled": "§cEnergy Capacity: §f%d EU",
     "block.gtceu.superconducting_coil": "Superconducting Coil Block",
+    "block.gtceu.surface_rock": "%s Surface Rock",
     "block.gtceu.tempered_glass": "Tempered Glass",
     "block.gtceu.test_mui": "Test Mui",
     "block.gtceu.the_end_marker": "The End",
@@ -1743,7 +1742,6 @@
     "block.gtceu.zpm_transformer_4a": "§cZPM Voltage§r Hi-Amp (4x) Transformer",
     "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r",
     "block.gtceu.zpm_world_accelerator": "§cElite World Accelerator III§r",
-    "block.gtceu.surface_rock": "%s Surface Rock",
     "button.gtceu.mark_as_depleted.name": "Mark as Depleted",
     "button.gtceu.toggle_waypoint.name": "Toggle Waypoint",
     "command.gtceu.cape.failure.does_not_exist": "Cape %s does not exist",
@@ -1981,6 +1979,7 @@
     "config.jade.plugin_gtceu.ldp_endpoint": "[GTCEu] Long Distance Pipeline Endpoint Info",
     "config.jade.plugin_gtceu.machine_mode": "[GTCEu] Machine Mode",
     "config.jade.plugin_gtceu.maintenance_info": "[GTCEu] Maintenance Info",
+    "config.jade.plugin_gtceu.me_grid_connected": "[GTCEu] Grid Connected Machine Info",
     "config.jade.plugin_gtceu.me_pattern_buffer": "[GTCEu] Pattern Buffer Info",
     "config.jade.plugin_gtceu.me_pattern_buffer_proxy": "[GTCEu] Pattern Buffer Proxy Info",
     "config.jade.plugin_gtceu.multiblock_structure": "[GTCEu] MultiBlock Structure",
@@ -2552,7 +2551,7 @@
     "gtceu.item_pipe.priority": "§9Priority: §f%d",
     "gtceu.jade.amperage_use": "%s A",
     "gtceu.jade.at": " @ ",
-    "gtceu.jade.changes_eu_sec": "%s EU/s",
+    "gtceu.jade.changes_eu_tick": "%s EU/t",
     "gtceu.jade.cleaned_this_second": "Cleaned hazard: %s/s",
     "gtceu.jade.days": "%s days",
     "gtceu.jade.energy_stored": "%d / %d EU",
@@ -2629,8 +2628,8 @@
     "gtceu.machine.available_recipe_map_4.tooltip": "Available Recipe Types: %s, %s, %s, %s",
     "gtceu.machine.basic.input_from_output_side.allow": "Allow Input from Output Side: ",
     "gtceu.machine.basic.input_from_output_side.disallow": "Disallow Input from Output Side: ",
-    "gtceu.machine.batch_disabled": "Batching Disabled",
-    "gtceu.machine.batch_enabled": "Batching Enabled",
+    "gtceu.machine.batching.disabled": "Batching Disabled",
+    "gtceu.machine.batching.enabled": "Batching Enabled",
     "gtceu.machine.bedrock_ore_miner.depletion": "§bDepletion Rate: §f%s%%",
     "gtceu.machine.bedrock_ore_miner.description": "§7Drills ores from veins under bedrock.",
     "gtceu.machine.bedrock_ore_miner.production": "§eProduction Multiplier: §f%dx, %fx overclocked",
@@ -2883,8 +2882,8 @@
     "gtceu.machine.large_boiler.tungstensteel.tooltip": "How do you even fuel this thing?",
     "gtceu.machine.large_chemical_reactor.tooltip": "Black Box Reactor",
     "gtceu.machine.large_combustion_engine.tooltip": "Fuel Ignition Chamber",
-    "gtceu.machine.large_combustion_engine.tooltip.boost_extreme": "Supply §f80 mB/s§7 of Liquid Oxygen to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.",
-    "gtceu.machine.large_combustion_engine.tooltip.boost_regular": "Supply §f20 mB/s§7 of Oxygen to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.",
+    "gtceu.machine.large_combustion_engine.tooltip.boost_extreme": "Supply §f80 mB/s§7 of §9Liquid Oxygen§7 to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.",
+    "gtceu.machine.large_combustion_engine.tooltip.boost_regular": "Supply §f20 mB/s§7 of §bOxygen§7 to produce up to §f%s EU/t§7 at §f2x§7 fuel consumption.",
     "gtceu.machine.large_miner.ev.tooltip": "Digging Ore instead of You",
     "gtceu.machine.large_miner.iv.tooltip": "Biome Excavator",
     "gtceu.machine.large_miner.luv.tooltip": "Terrestrial Harvester",

src/generated/resources/data/c/tags/block/mineable/shears.json

@@ -10,7 +10,7 @@
         "minecraft:large_fern",
         "minecraft:nether_sprouts",
         "minecraft:seagrass",
-        "minecraft:grass_block",
+        "minecraft:short_grass",
         "minecraft:small_dripleaf",
         "minecraft:tall_grass",
         "minecraft:tall_seagrass",

src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -8,6 +8,38 @@
         "gtceu:cleanroom_glass",
         "gtceu:petrified_foam",
         "gtceu:reinforced_stone",
+        "gtceu:white_lamp",
+        "gtceu:orange_lamp",
+        "gtceu:magenta_lamp",
+        "gtceu:light_blue_lamp",
+        "gtceu:yellow_lamp",
+        "gtceu:lime_lamp",
+        "gtceu:pink_lamp",
+        "gtceu:gray_lamp",
+        "gtceu:light_gray_lamp",
+        "gtceu:cyan_lamp",
+        "gtceu:purple_lamp",
+        "gtceu:blue_lamp",
+        "gtceu:brown_lamp",
+        "gtceu:green_lamp",
+        "gtceu:red_lamp",
+        "gtceu:black_lamp",
+        "gtceu:white_borderless_lamp",
+        "gtceu:orange_borderless_lamp",
+        "gtceu:magenta_borderless_lamp",
+        "gtceu:light_blue_borderless_lamp",
+        "gtceu:yellow_borderless_lamp",
+        "gtceu:lime_borderless_lamp",
+        "gtceu:pink_borderless_lamp",
+        "gtceu:gray_borderless_lamp",
+        "gtceu:light_gray_borderless_lamp",
+        "gtceu:cyan_borderless_lamp",
+        "gtceu:purple_borderless_lamp",
+        "gtceu:blue_borderless_lamp",
+        "gtceu:brown_borderless_lamp",
+        "gtceu:green_borderless_lamp",
+        "gtceu:red_borderless_lamp",
+        "gtceu:black_borderless_lamp",
         "gtceu:white_studs",
         "gtceu:orange_studs",
         "gtceu:magenta_studs",

src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java

@@ -611,11 +611,11 @@ public static void init(RegistrateLangProvider provider) {
 
         replace(provider, "item.gtceu.bucket", "%s Bucket");
 
-        replace(provider, "block.gtceu.oil_heavy", "Heavy Oil");
-        replace(provider, "block.gtceu.oil_light", "Light Oil");
-        replace(provider, "block.gtceu.oil_medium", "Raw Oil");
-        replace(provider, "block.gtceu.oil", "Oil");
-        replace(provider, "block.gtceu.creosote", "Creosote");
+//        replace(provider, "block.gtceu.oil_heavy", "Heavy Oil");
+//        replace(provider, "block.gtceu.oil_light", "Light Oil");
+//        replace(provider, "block.gtceu.oil_medium", "Raw Oil");
+//        replace(provider, "block.gtceu.oil", "Oil");
+//        replace(provider, "block.gtceu.creosote", "Creosote");
 
         replace(provider, GTBlocks.BATTERY_EMPTY_TIER_I.get().getDescriptionId(), "Empty Tier I Capacitor");
         replace(provider, GTBlocks.BATTERY_LAPOTRONIC_EV.get().getDescriptionId(), "EV Lapotronic Capacitor");