Skip to content

Commit

Permalink
Change "L/t" to "mb/t" for consistency (GregTechCEu#1379)
Browse files Browse the repository at this point in the history
Co-authored-by: screret <68943070+screret@users.noreply.github.com>
  • Loading branch information
3x1t-5tyl3 and screret authored Jun 7, 2024
1 parent 7f10309 commit 3aead6e
Show file tree
Hide file tree
Showing 18 changed files with 311 additions and 207 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/andesite",
"position": [
-200,
100
-50,
50
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"page": "gtceu:generation/basalt",
"position": [
-200,
-150,
150
],
"pre_nodes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/deepslate",
"position": [
-100,
50
-150,
100
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"page": "gtceu:generation/diorite",
"position": [
-150,
-100,
50
],
"pre_nodes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/granite",
"position": [
-50,
150
-150,
50
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"page": "gtceu:generation/gravel",
"position": [
-200,
50
150
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/red_sand",
"position": [
-50,
50
-250,
150
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/sand",
"position": [
-150,
150
-50,
100
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/stone",
"position": [
-150,
100
-200,
50
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"page": "gtceu:generation/tuff",
"position": [
-100,
150
100
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
69 changes: 36 additions & 33 deletions src/generated/resources/assets/gtceu/lang/en_ud.json

Large diffs are not rendered by default.

69 changes: 36 additions & 33 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
"behavior.portable_scanner.energy_container_storage": "Energy: %s EU / %s EU",
"behavior.portable_scanner.eu_per_sec": "Average (last second): %s EU/t",
"behavior.portable_scanner.machine_disabled": "Disabled.",
"behavior.portable_scanner.machine_front_facing": "Front Facing: %s",
"behavior.portable_scanner.machine_power_loss": "Shut down due to power loss.",
"behavior.portable_scanner.machine_progress": "Progress/Load: %s / %s",
"behavior.portable_scanner.machine_upwards_facing": "Upwards Facing: %s",
"behavior.portable_scanner.mode.caption": "Display mode: %s",
"behavior.portable_scanner.mode.show_all_info": "Show all info",
"behavior.portable_scanner.mode.show_block_info": "Show block info",
Expand All @@ -38,7 +40,7 @@
"behavior.portable_scanner.multiblock_parallel": "Multi Processing: %s",
"behavior.portable_scanner.position": "----- X: %s Y: %s Z: %s D: %s -----",
"behavior.portable_scanner.state": "%s: %s",
"behavior.portable_scanner.tank": "Tank %s: %s L / %s L %s",
"behavior.portable_scanner.tank": "Tank %s: %s mB / %s mB %s",
"behavior.portable_scanner.tanks_empty": "All Tanks Empty",
"behavior.portable_scanner.workable_consumption": "Probably Uses: %s EU/t at %s A",
"behavior.portable_scanner.workable_production": "Probably Produces: %s EU/t at %s A",
Expand Down Expand Up @@ -2034,6 +2036,7 @@
"config.gtceu.option.dumpAssets": "dumpAssets",
"config.gtceu.option.dumpRecipes": "dumpRecipes",
"config.gtceu.option.enableCleanroom": "enableCleanroom",
"config.gtceu.option.enableCompass": "enableCompass",
"config.gtceu.option.enableMaintenance": "enableMaintenance",
"config.gtceu.option.enablePlatformConverters": "enablePlatformConverters",
"config.gtceu.option.enableResearch": "enableResearch",
Expand Down Expand Up @@ -2144,14 +2147,14 @@
"cover.advanced_fluid_detector.invert.disabled.0": "Output: Normal",
"cover.advanced_fluid_detector.invert.disabled.1": "",
"cover.advanced_fluid_detector.invert.disabled.2": "Toggle to invert the redstone logic",
"cover.advanced_fluid_detector.invert.disabled.3": "By default, redstone stops emitting when less than the minimum L of fluid, and starts emitting when greater than the min L of fluid up to the set maximum",
"cover.advanced_fluid_detector.invert.disabled.3": "By default, redstone stops emitting when less than the minimum mB of fluid, and starts emitting when greater than the min mB of fluid up to the set maximum",
"cover.advanced_fluid_detector.invert.enabled.0": "Output: Inverted",
"cover.advanced_fluid_detector.invert.enabled.1": "",
"cover.advanced_fluid_detector.invert.enabled.2": "Toggle to invert the redstone logic",
"cover.advanced_fluid_detector.invert.enabled.3": "By default, redstone stops emitting when less than the minimum L of fluid, and starts emitting when greater than the min L of fluid up to the set maximum",
"cover.advanced_fluid_detector.invert.enabled.3": "By default, redstone stops emitting when less than the minimum mB of fluid, and starts emitting when greater than the min mB of fluid up to the set maximum",
"cover.advanced_fluid_detector.label": "Advanced Fluid Detector",
"cover.advanced_fluid_detector.max": "Max Fluid (L)",
"cover.advanced_fluid_detector.min": "Min Fluid (L)",
"cover.advanced_fluid_detector.max": "Max Fluid (mB)",
"cover.advanced_fluid_detector.min": "Min Fluid (mB)",
"cover.advanced_item_detector.invert.disabled.0": "Output: Normal",
"cover.advanced_item_detector.invert.disabled.1": "",
"cover.advanced_item_detector.invert.disabled.2": "Toggle to invert the redstone logic",
Expand All @@ -2163,8 +2166,8 @@
"cover.advanced_item_detector.label": "Advanced Item Detector",
"cover.advanced_item_detector.max": "Max Items",
"cover.advanced_item_detector.min": "Min Items",
"cover.bucket.mode.bucket": "kL",
"cover.bucket.mode.milli_bucket": "L",
"cover.bucket.mode.bucket": "B",
"cover.bucket.mode.milli_bucket": "mB",
"cover.conveyor.blocks_input.disabled.0": "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.",
"cover.conveyor.blocks_input.disabled.1": "§cDisabled",
"cover.conveyor.blocks_input.enabled.0": "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.",
Expand Down Expand Up @@ -2369,7 +2372,7 @@
"gtceu.command.copy.copied_end": "] to the clipboard",
"gtceu.command.copy.copied_start": "Copied [",
"gtceu.command.hand.electric": "Electric Info: %d / %d EU - Tier: %d; Is Battery: %s",
"gtceu.command.hand.fluid": "Fluid Info: %d / %d L; Can Fill: %s; Can Drain: %s",
"gtceu.command.hand.fluid": "Fluid Info: %d / %d mB; Can Fill: %s; Can Drain: %s",
"gtceu.command.hand.fluid2": "Fluid Id:",
"gtceu.command.hand.groovy": "Consider using §6/gs hand",
"gtceu.command.hand.item_id": "Item: %s (Metadata: %d)",
Expand Down Expand Up @@ -2429,7 +2432,7 @@
"gtceu.extractor": "Extractor",
"gtceu.extruder": "Extruder",
"gtceu.fermenter": "Fermenter",
"gtceu.fluid.amount": "§9Amount: %d/%d L",
"gtceu.fluid.amount": "§9Amount: %d/%d mB",
"gtceu.fluid.click_combined": "§7Click with a Fluid Container to §cempty §7or §bfill §7the tank (Shift-click for a full stack).",
"gtceu.fluid.click_to_empty": "§7Click with a Fluid Container to §cempty §7the tank (Shift-click for a full stack).",
"gtceu.fluid.click_to_fill": "§7Click with a Fluid Container to §bfill §7the tank (Shift-click for a full stack).",
Expand All @@ -2448,7 +2451,7 @@
"gtceu.fluid.type_acid.tooltip": "§6Acidic! Handle with care!",
"gtceu.fluid_heater": "Fluid Heater",
"gtceu.fluid_pipe.acid_proof": "§6Can handle Acids",
"gtceu.fluid_pipe.capacity": "§9Capacity: §f%d L",
"gtceu.fluid_pipe.capacity": "§9Capacity: §f%d mB",
"gtceu.fluid_pipe.channels": "§eChannels: §f%d",
"gtceu.fluid_pipe.cryo_proof": "§6Can handle Cryogenics",
"gtceu.fluid_pipe.gas_proof": "§6Can handle Gases",
Expand Down Expand Up @@ -2824,7 +2827,7 @@
"gtceu.machine.hpca.component_type.computation_cooling": "§cRequires up to: §f%d Cooling",
"gtceu.machine.hpca.component_type.computation_cwut": "§9Computation: §f%d CWU/t",
"gtceu.machine.hpca.component_type.cooler_active": "§bCooler Type: §fActive",
"gtceu.machine.hpca.component_type.cooler_active_coolant": "§cRequires up to: §f%d L/t %s",
"gtceu.machine.hpca.component_type.cooler_active_coolant": "§cRequires up to: §f%d mB/t %s",
"gtceu.machine.hpca.component_type.cooler_cooling": "§aProvides: §f%d Cooling",
"gtceu.machine.hpca.component_type.cooler_passive": "§bCooler Type: §fPassive",
"gtceu.machine.hpca.component_type.damaged": "Can be damaged by HPCA overheating!",
Expand Down Expand Up @@ -2924,8 +2927,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 L/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 L/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 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_miner.ev.tooltip": "Digging Ore instead of You",
"gtceu.machine.large_miner.iv.tooltip": "Biome Excavator",
"gtceu.machine.large_miner.luv.tooltip": "Terrestrial Harvester",
Expand Down Expand Up @@ -3046,7 +3049,7 @@
"gtceu.machine.me.item_export.tooltip": "Stores items directly into an ME network.",
"gtceu.machine.me.item_import.tooltip": "Fetches items from an ME network automatically.",
"gtceu.machine.miner.chunkradius": "Chunk Radius: %d",
"gtceu.machine.miner.fluid_usage": "Uses §f%d L/t §7of §f%s§7, doubled per overclock.",
"gtceu.machine.miner.fluid_usage": "Uses §f%d mB/t §7of §f%s§7, doubled per overclock.",
"gtceu.machine.miner.minex": "mX: %d",
"gtceu.machine.miner.miney": "mY: %d",
"gtceu.machine.miner.minez": "mZ: %d",
Expand Down Expand Up @@ -3347,7 +3350,7 @@
"gtceu.multiblock.large_boiler.heat_time_tooltip": "§7Takes §f%d seconds §7to boiling up",
"gtceu.multiblock.large_boiler.max_temperature": "Max Temperature: %dK, Steam Production: %dmB/t",
"gtceu.multiblock.large_boiler.rate_tooltip": "§7Produces §f%d L §7of Steam with §f1 Coal",
"gtceu.multiblock.large_boiler.steam_output": "Steam Output: %s L/t",
"gtceu.multiblock.large_boiler.steam_output": "Steam Output: %s mB/t",
"gtceu.multiblock.large_boiler.temperature": "Temperature: %sK / %sK",
"gtceu.multiblock.large_boiler.throttle": "Throttle: %d",
"gtceu.multiblock.large_boiler.throttle.tooltip": "Boiler can output less Steam and consume less fuel (efficiency is not lost, does not affect heat-up time)",
Expand Down Expand Up @@ -3437,14 +3440,14 @@
"gtceu.multiblock.primitive_blast_furnace.bronze.description": "The Primitive Blast Furnace (PBF) is a multiblock structure used for cooking steel in the early game. Although not very fast, it will provide you with steel for your first setups.",
"gtceu.multiblock.primitive_water_pump.description": "The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier.",
"gtceu.multiblock.primitive_water_pump.extra1.0": "Biome Coefficient:",
"gtceu.multiblock.primitive_water_pump.extra1.1": " Ocean, River: 1000 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.2": " Swamp: 800 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.3": " Jungle: 350 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.4": " Snowy: 300 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.5": " Plains, Forest: 250 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.6": " Taiga: 175 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.7": " Beach: 170 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.8": " Other: 100 L/s",
"gtceu.multiblock.primitive_water_pump.extra1.1": " Ocean, River: 1000 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.2": " Swamp: 800 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.3": " Jungle: 350 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.4": " Snowy: 300 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.5": " Plains, Forest: 250 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.6": " Taiga: 175 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.7": " Beach: 170 mB/s",
"gtceu.multiblock.primitive_water_pump.extra1.8": " Other: 100 mB/s",
"gtceu.multiblock.primitive_water_pump.extra2.0": "Hatch Multipliers:",
"gtceu.multiblock.primitive_water_pump.extra2.1": " Pump Hatch: 1x",
"gtceu.multiblock.primitive_water_pump.extra2.2": " ULV Output Hatch: 2x",
Expand Down Expand Up @@ -3618,24 +3621,24 @@
"gtceu.universal.clear_nbt_recipe.tooltip": "§cThis will destroy all contents!",
"gtceu.universal.disabled": "Multiblock Sharing §4Disabled",
"gtceu.universal.enabled": "Multiblock Sharing §aEnabled",
"gtceu.universal.kiloliters": "%s kL",
"gtceu.universal.liters": "%s L",
"gtceu.universal.kiloliters": "%s mB",
"gtceu.universal.liters": "%s B",
"gtceu.universal.tooltip.amperage_in": "§eAmperage IN: §f%dA",
"gtceu.universal.tooltip.amperage_in_out": "§eAmperage IN/OUT: §f%dA",
"gtceu.universal.tooltip.amperage_in_out_till": "§eAmperage IN/OUT up to: §f%dA",
"gtceu.universal.tooltip.amperage_in_till": "§eAmperage IN up to: §f%dA",
"gtceu.universal.tooltip.amperage_out": "§eAmperage OUT: §f%dA",
"gtceu.universal.tooltip.amperage_out_till": "§eAmperage OUT up to: §f%dA",
"gtceu.universal.tooltip.base_production_eut": "§eBase Production: §f%d EU/t",
"gtceu.universal.tooltip.base_production_fluid": "§eBase Production: §f%d L/t",
"gtceu.universal.tooltip.base_production_fluid": "§eBase Production: §f%d mB/t",
"gtceu.universal.tooltip.chunk_mode": "Chunk Mode: ",
"gtceu.universal.tooltip.deprecated": "§4§lWARNING:§r§4 DEPRECATED. WILL BE REMOVED IN A FUTURE VERSION.§r",
"gtceu.universal.tooltip.energy_storage_capacity": "§cEnergy Capacity: §r%d EU",
"gtceu.universal.tooltip.energy_tier_range": "§aAllowed Voltage Tiers: §f%s §f- %s",
"gtceu.universal.tooltip.fluid_storage_capacity": "§9Fluid Capacity: §f%d L",
"gtceu.universal.tooltip.fluid_storage_capacity_mult": "§9Fluid Capacity: §f%d §7Tanks, §f%d L §7each",
"gtceu.universal.tooltip.fluid_stored": "§dFluid Stored: §f%s, %d L",
"gtceu.universal.tooltip.fluid_transfer_rate": "§bTransfer Rate: §f%d L/t",
"gtceu.universal.tooltip.fluid_storage_capacity": "§9Fluid Capacity: §f%d mB",
"gtceu.universal.tooltip.fluid_storage_capacity_mult": "§9Fluid Capacity: §f%d §7Tanks, §f%d mB §7each",
"gtceu.universal.tooltip.fluid_stored": "§dFluid Stored: §f%s, %d mB",
"gtceu.universal.tooltip.fluid_transfer_rate": "§bTransfer Rate: §f%d mB/t",
"gtceu.universal.tooltip.item_storage_capacity": "§6Item Slots: §f%d",
"gtceu.universal.tooltip.item_storage_total": "§6Item Capacity: §f%d items",
"gtceu.universal.tooltip.item_stored": "§dItem Stored: §f%s, %d items",
Expand All @@ -3645,15 +3648,15 @@
"gtceu.universal.tooltip.max_voltage_in_out": "§aMax Voltage IN/OUT: §f%d EU/t (%s§f)",
"gtceu.universal.tooltip.max_voltage_out": "§aMax Voltage OUT: §f%d (%s§f)",
"gtceu.universal.tooltip.parallel": "§dMax Parallel: §f%d",
"gtceu.universal.tooltip.produces_fluid": "§eProduces: §f%d L/t",
"gtceu.universal.tooltip.produces_fluid": "§eProduces: §f%d mB/t",
"gtceu.universal.tooltip.requires_redstone": "§4Requires Redstone power",
"gtceu.universal.tooltip.silk_touch": "Silk Touch: ",
"gtceu.universal.tooltip.terrain_resist": "This Machine will not explode when exposed to the Elements",
"gtceu.universal.tooltip.uses_per_hour_lubricant": "Uses §f%d L/hr §7of Lubricant while working",
"gtceu.universal.tooltip.uses_per_hour_lubricant": "Uses §f%d mB/hr §7of Lubricant while working",
"gtceu.universal.tooltip.uses_per_op": "Uses §f%d EU/operation",
"gtceu.universal.tooltip.uses_per_second": "Uses §f%d EU/s §7while working",
"gtceu.universal.tooltip.uses_per_tick": "Uses §f%d EU/t §7while working",
"gtceu.universal.tooltip.uses_per_tick_steam": "Uses §f%d L/t §7of Steam while working",
"gtceu.universal.tooltip.uses_per_tick_steam": "Uses §f%d mB/t §7of Steam while working",
"gtceu.universal.tooltip.voltage_in": "§aVoltage IN: §f%d EU/t (%s§f)",
"gtceu.universal.tooltip.voltage_in_out": "§aVoltage IN/OUT: §f%d EU/t (%s§f)",
"gtceu.universal.tooltip.voltage_out": "§aVoltage OUT: §f%d EU/t (%s§f)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public interface IHPCACoolantProvider extends IHPCAComponentHatch {
* Actual amount used will depend on how much of this cooler is actually being utilized
* by Computation providers.
*
* @return The amount of coolant to use per tick, in L/t
* @return The amount of coolant to use per tick, in mB/t
*/
default int getMaxCoolantPerTick() {
return 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public int getMaxCoolingDemand() {
return maxCooling;
}

/** How much coolant this HPCA can consume in a tick, in L/t. */
/** How much coolant this HPCA can consume in a tick, in mB/t. */
public int getMaxCoolantDemand() {
int maxCoolant = 0;
for (var coolantProvider : coolantProviders) {
Expand Down
Loading

0 comments on commit 3aead6e

Please sign in to comment.