Skip to content

Commit 2c8cdb2

Browse files
authored
Improved number formatting, with a couple of other fixes (#1467)
1 parent 0113345 commit 2c8cdb2

1 file changed

Lines changed: 57 additions & 57 deletions

File tree

src/main/resources/assets/gregtech/lang/en_us.lang

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ enchantment.disjunction=Disjunction
1313
gregtech.top.energy_stored=Energy:
1414
gregtech.top.progress=Progress:
1515
gregtech.top.working_disabled=Working Disabled
16-
gregtech.top.transform_up=§cStep Up§r %s (%dA) -> %s (%dA)
17-
gregtech.top.transform_down=§aStep Down§r %s (%dA) -> %s (%dA)
18-
gregtech.top.transform_input=§6Input:§r %s (%dA)
19-
gregtech.top.transform_output=§9Output:§r %s (%dA)
16+
gregtech.top.transform_up=§cStep Up§r %s (%,dA) -> %s (%,dA)
17+
gregtech.top.transform_down=§aStep Down§r %s (%,dA) -> %s (%,dA)
18+
gregtech.top.transform_input=§6Input:§r %s (%,dA)
19+
gregtech.top.transform_output=§9Output:§r %s (%,dA)
2020
gregtech.top.fuel_info=/%,d for %,d secs
2121
gregtech.top.fuel_min_consume=/%,d needs %,d
2222
gregtech.top.fuel_name=Fuel: %s
@@ -39,15 +39,15 @@ gregtech.multiblock.large_turbine.description=Large Turbines are multiblocks tha
3939
item.invalid.name=Invalid item
4040
fluid.empty=Empty
4141

42-
metaitem.generic.fluid_container.tooltip=%d/%dL %s
42+
metaitem.generic.fluid_container.tooltip=%,d/%,dL %s
4343
metaitem.generic.fluid_container.tooltip_empty=Empty
44-
metaitem.generic.electric_item.tooltip=%d/%d EU - Tier §e%d
44+
metaitem.generic.electric_item.tooltip=%,d/%,d EU - Tier §e%s
4545
metaitem.electric.discharge_mode.enabled=§eDischarge Mode Enabled
4646
metaitem.electric.discharge_mode.disabled=§eDischarge Mode Disabled
4747
metaitem.electric.discharge_mode.tooltip=Use while sneaking to toggle discharge mode
4848

4949
metaitem.dust.tooltip.purify=Throw into Cauldron to get clean Dust
50-
metaitem.int_circuit.configuration=Configuration: %d
50+
metaitem.int_circuit.configuration=Configuration: %,d
5151
metaitem.credit.copper.name=Copper Credit
5252
metaitem.credit.copper.tooltip=0.125 Credits
5353
metaitem.credit.cupronickel.name=Cupronickel Credit
@@ -680,10 +680,10 @@ metaitem.behavior.mode_switch.mode_switched=§eMode Set to: %s
680680
metaitem.behavior.mode_switch.current_mode=Mode: %s
681681

682682
metaitem.tool.tooltip.primary_material=Material: %s (%s lvl)
683-
metaitem.tool.tooltip.attack_damage=Attack damage: %d
684-
metaitem.tool.tooltip.mining_speed=Mining speed: %d
685-
metaitem.tool.tooltip.durability=Durability: %d/%d
686-
metaitem.tool.tooltip.rotor.efficiency=Rotor Efficiency: %d%%
683+
metaitem.tool.tooltip.attack_damage=Attack damage: %,.1f
684+
metaitem.tool.tooltip.mining_speed=Mining speed: %,.1f
685+
metaitem.tool.tooltip.durability=Durability: %,d/%,d
686+
metaitem.tool.tooltip.rotor.efficiency=Rotor Efficiency: %,d%%
687687
metaitem.tool.tooltip.hammer.extra_drop=Has a chance to drop double crushed ores
688688

689689
cover.filter.blacklist.disabled=Whitelist
@@ -745,7 +745,7 @@ cover.machine_controller.name=Machine Controller Settings
745745
cover.machine_controller.normal=Normal
746746
cover.machine_controller.inverted=Inverted
747747
cover.machine_controller.inverted.description=§eNormal§r - in this mode, the cover will require a signal weaker than the set redstone level to run/n§eInverted§r - in this mode, the cover will require a signal stronger than the set redstone level to run
748-
cover.machine_controller.redstone=Min Redstone Strength: %d
748+
cover.machine_controller.redstone=Min Redstone Strength: %,d
749749
cover.machine_controller.mode.machine=Control Machine
750750
cover.machine_controller.mode.cover_up=Control Cover (Top)
751751
cover.machine_controller.mode.cover_down=Control Cover (Bottom)
@@ -1623,7 +1623,7 @@ recipemap.plasma_generator.name=Plasma Generator
16231623
behaviour.hoe=Can till dirt
16241624
behaviour.soft_hammer=Use on machine to allow/disallow it to work
16251625
behaviour.lighter.tooltip=Can light things on fire
1626-
behaviour.lighter.uses=Remaining uses: %d
1626+
behaviour.lighter.uses=Remaining uses: %,d
16271627
behavior.plunger.description=Use to clear 1000 mb out of a machine's output tank./nUse while sneaking to clear 1000 mb out of a machine's input tank./nInput tank clearing works only on GTCE machines!
16281628
behavior.toggle_energy_consumer.tooltip=Use to toggle mode
16291629

@@ -1664,10 +1664,10 @@ fluid.distilled_water=Distilled Water
16641664

16651665
# Wire coil blocks
16661666
tile.wire_coil.tooltip_ebf=When used in §aElectric Blast Furnace§7:
1667-
tile.wire_coil.tooltip_heat= Base Heating Capacity: §e%dK
1667+
tile.wire_coil.tooltip_heat= Base Heating Capacity: §e%,dK
16681668
tile.wire_coil.tooltip_smelter=When used in §aMulti Smelter§7:
1669-
tile.wire_coil.tooltip_level= Level: §e%d
1670-
tile.wire_coil.tooltip_discount= Energy Discount: §a%dx
1669+
tile.wire_coil.tooltip_level= Level: §e%,d
1670+
tile.wire_coil.tooltip_discount= Energy Discount: §a%,dx
16711671

16721672
tile.wire_coil.cupronickel.name=Cupronickel Coil Block
16731673
tile.wire_coil.kanthal.name=Kanthal Coil Block
@@ -1775,7 +1775,7 @@ gregtech.machine.workbench.tab.workbench=Crafting
17751775
gregtech.machine.workbench.tab.item_list=Storage
17761776
gregtech.machine.workbench.storage_note_1=(Available items from connected
17771777
gregtech.machine.workbench.storage_note_2=inventories usable for crafting)
1778-
gregtech.item_list.items_stored=§7Stored: %d
1778+
gregtech.item_list.item_stored=§7Stored: %,d
17791779

17801780
gregtech.machine.workbench.tab.crafting=Crafting
17811781
gregtech.machine.workbench.tab.container=Container
@@ -1846,7 +1846,7 @@ tile.concrete.dark_bricks.mossy.name=Mossy Dark Concrete Bricks
18461846
tile.concrete.dark_bricks.chiseled.name=Chiseled Dark Concrete Bricks
18471847

18481848
# Steam machines
1849-
gregtech.machine.steam_boiler.tooltip_produces=Produces %dmb of steam in %d ticks
1849+
gregtech.machine.steam_boiler.tooltip_produces=Produces %,dmb of steam in %,d ticks
18501850

18511851
gregtech.machine.steam_boiler_coal_bronze.name=Small Steam Coal Boiler
18521852
gregtech.machine.steam_boiler_coal_bronze.tooltip=An early way to get Steam Power
@@ -1908,8 +1908,8 @@ gregtech.machine.block_breaker.mv.name=Advanced Block Breaker
19081908
gregtech.machine.block_breaker.hv.name=Advanced Block Breaker II
19091909
gregtech.machine.block_breaker.ev.name=Advanced Block Breaker III
19101910
gregtech.machine.block_breaker.tooltip=Mines block on front face and collects its drops
1911-
gregtech.machine.block_breaker.consumption=Consumes §e%d EU§7 per operation
1912-
gregtech.machine.block_breaker.speed_bonus=Speed Bonus: §e%d%%
1911+
gregtech.machine.block_breaker.consumption=Consumes §e%,d EU§7 per operation
1912+
gregtech.machine.block_breaker.speed_bonus=Speed Bonus: §e%,d%%
19131913

19141914
gregtech.machine.electric_furnace.lv.name=Basic Electric Furnace
19151915
gregtech.machine.electric_furnace.mv.name=Advanced Electric Furnace
@@ -2214,9 +2214,9 @@ gregtech.machine.battery_buffer.max.16.name=MAX Voltage Battery Buffer
22142214
# Transformers
22152215
gregtech.machine.transformer.tooltip_tool_usage=Use Soft Hammer to invert (Starts as Transform Down)
22162216
gregtech.machine.transformer.tooltip_transform_down=Transform Down:
2217-
gregtech.machine.transformer.message_transform_down=Transforming Down, In: %dV %d Amp, Out: %dV %d Amp
2217+
gregtech.machine.transformer.message_transform_down=Transforming Down, In: %,dV %,d Amp, Out: %,dV %,d Amp
22182218
gregtech.machine.transformer.tooltip_transform_up=Transform Up:
2219-
gregtech.machine.transformer.message_transform_up=Transforming Up, In: %dV %d Amp, Out: %dV %d Amp
2219+
gregtech.machine.transformer.message_transform_up=Transforming Up, In: %,dV %,d Amp, Out: %,dV %,d Amp
22202220

22212221
gregtech.machine.transformer.lv.name=Low Voltage Transformer
22222222
gregtech.machine.transformer.mv.name=Medium Voltage Transformer
@@ -2241,8 +2241,8 @@ gregtech.machine.charger.uv.name=Ultimate Voltage Battery Charger
22412241
gregtech.machine.charger.max.name=MAX Voltage Battery Charger
22422242

22432243
# Pumps
2244-
gregtech.machine.pump.tooltip_range=Pumping Area: %dx%d
2245-
gregtech.machine.pump.tooltip_speed=Pumps Fluid every %d ticks
2244+
gregtech.machine.pump.tooltip_range=Pumping Area: %,dx%,d
2245+
gregtech.machine.pump.tooltip_speed=Pumps Fluid every %,d ticks
22462246

22472247
gregtech.machine.pump.lv.name=Basic Pump
22482248
gregtech.machine.pump.mv.name=Advanced Pump
@@ -2254,12 +2254,12 @@ gregtech.machine.item_collector.mv.name=Advanced Item Collector
22542254
gregtech.machine.item_collector.hv.name=Advanced Item Collector II
22552255
gregtech.machine.item_collector.ev.name=Advanced Item Collector III
22562256

2257-
gregtech.machine.item_collector.collect_range=Collection Area: %dx%d
2257+
gregtech.machine.item_collector.collect_range=Collection Area: %,dx%,d
22582258
gregtech.machine.item_collector.gui.collect_range=Collect in %s blocks
22592259

22602260
#Quantum chests
22612261
gregtech.machine.quantum_chest.tooltip=Better than JABBA.
2262-
gregtech.machine.quantum_chest.capacity=Item Capacity: %d items
2262+
gregtech.machine.quantum_chest.capacity=Item Capacity: %,d items
22632263
gregtech.machine.quantum_chest.items_stored=Item Amount:
22642264

22652265
gregtech.machine.quantum_chest.mv.name=Basic Quantum Chest
@@ -2269,7 +2269,7 @@ gregtech.machine.quantum_chest.iv.name=Black Hole-Quantum Chest III
22692269

22702270
#Quantum tanks
22712271
gregtech.machine.quantum_tank.tooltip=Compact place to store all your fluids.
2272-
gregtech.machine.quantum_tank.capacity=Fluid Capacity: %d mb
2272+
gregtech.machine.quantum_tank.capacity=Fluid Capacity: %,d mb
22732273

22742274
gregtech.machine.quantum_tank.mv.name=Basic Quantum Tank
22752275
gregtech.machine.quantum_tank.hv.name=Advanced Quantum Tank
@@ -2282,7 +2282,7 @@ gregtech.machine.air_collector.mv.name=Advanced Air Collector
22822282
gregtech.machine.air_collector.hv.name=Advanced Air Collector II
22832283
gregtech.machine.air_collector.ev.name=Atmosphere Collector III
22842284
gregtech.machine.air_collector.tooltip=Collects air from adjacent blocks at the expense of energy
2285-
gregtech.machine.air_collector.collection_speed=Produces %d mb of Air every %d ticks
2285+
gregtech.machine.air_collector.collection_speed=Produces %,d mb of Air every %,d ticks
22862286
gregtech.machine.air_collector.jei_description=The Air Collector collects air from adjacent blocks for a little bit of EU
22872287

22882288
#Tesla Coil
@@ -2295,8 +2295,8 @@ gregtech.machine.fisher.mv.name=Advanced Fisher
22952295
gregtech.machine.fisher.hv.name=Advanced Fisher II
22962296
gregtech.machine.fisher.ev.name=Advanced Fisher III
22972297
gregtech.machine.fisher.tooltip=Costs string to fish. Consumes one string each time.
2298-
gregtech.machine.fisher.speed=Catches something every %d ticks
2299-
gregtech.machine.fisher.requirement=Requires a square of water with size of %d blocks directly below.
2298+
gregtech.machine.fisher.speed=Catches something every %,d ticks
2299+
gregtech.machine.fisher.requirement=Requires a square of water with size of %,d blocks directly below.
23002300

23012301
# General machinery
23022302
gregtech.machine.basic.input_from_output_side.allow=Allow Input from Output Side
@@ -2739,7 +2739,7 @@ behaviour.paintspray.brown.tooltip=Can paint things in Brown
27392739
behaviour.paintspray.green.tooltip=Can paint things in Green
27402740
behaviour.paintspray.red.tooltip=Can paint things in Red
27412741
behaviour.paintspray.black.tooltip=Can paint things in Black
2742-
behaviour.paintspray.uses=Remaining Uses: %d
2742+
behaviour.paintspray.uses=Remaining Uses: %,d
27432743
behaviour.prospecting=Usable for Prospecting
27442744

27452745
# Multiblock machine controllers
@@ -2858,33 +2858,33 @@ gregtech.machine.rotor_holder.zpm.name=Rotor Holder (ZPM)
28582858
gregtech.machine.rotor_holder.uv.name=Rotor Holder (UV)
28592859
gregtech.machine.rotor_holder.max.name=Rotor Holder (MAX)
28602860

2861-
gregtech.machine.fluid_tank.max_multiblock=Max Multiblock Size: %dx%dx%d
2861+
gregtech.machine.fluid_tank.max_multiblock=Max Multiblock Size: %,dx%,dx%,d
28622862
gregtech.machine.fluid_tank.fluid=Contains %s mb of %s
28632863

28642864
gregtech.machine.item_controller.tooltip.redstone=Requires Redstone Input To Work
2865-
gregtech.machine.item_controller.tooltip.consumption=While working, constantly consumes %d EU/t
2865+
gregtech.machine.item_controller.tooltip.consumption=While working, constantly consumes %,d EU/t
28662866

28672867
# Universal tooltips
2868-
gregtech.universal.tooltip.voltage_in=Voltage IN: §a%d §7(§a%s§7)
2869-
gregtech.universal.tooltip.voltage_out=Voltage OUT: §a%d §7(§a%s§7)
2870-
gregtech.universal.tooltip.energy_storage_capacity=Internal Energy Capacity: §9%d
2871-
gregtech.universal.tooltip.amperage_in=Amperage IN: §e%d
2872-
gregtech.universal.tooltip.amperage_in_till=Amperage IN up to: §e%d
2873-
gregtech.universal.tooltip.amperage_out=Amperage OUT: §e%d
2874-
gregtech.universal.tooltip.amperage_out_till=Amperage OUT up to: §e%d
2875-
gregtech.universal.tooltip.item_storage_capacity=Item Slots: %d
2876-
gregtech.universal.tooltip.fluid_storage_capacity=Fluid Capacity: %d mb
2877-
gregtech.universal.tooltip.max_voltage_in=Max Voltage IN: §a%d §7(§a%s§7)
2878-
2879-
gregtech.recipe.total=Total: %d EU
2880-
gregtech.recipe.eu=Usage: %d EU/t (%s)
2881-
gregtech.recipe.eu_inverted=Generation: %d EU/t
2882-
gregtech.recipe.duration=Duration: %.1f secs
2883-
gregtech.recipe.amperage=Amperage: %d
2868+
gregtech.universal.tooltip.voltage_in=Voltage IN: §a%,d §7(§a%s§7)
2869+
gregtech.universal.tooltip.voltage_out=Voltage OUT: §a%,d §7(§a%s§7)
2870+
gregtech.universal.tooltip.energy_storage_capacity=Internal Energy Capacity: §9%,d
2871+
gregtech.universal.tooltip.amperage_in=Amperage IN: §e%,d
2872+
gregtech.universal.tooltip.amperage_in_till=Amperage IN up to: §e%,d
2873+
gregtech.universal.tooltip.amperage_out=Amperage OUT: §e%,d
2874+
gregtech.universal.tooltip.amperage_out_till=Amperage OUT up to: §e%,d
2875+
gregtech.universal.tooltip.item_storage_capacity=Item Slots: %,d
2876+
gregtech.universal.tooltip.fluid_storage_capacity=Fluid Capacity: %,d mb
2877+
gregtech.universal.tooltip.max_voltage_in=Max Voltage IN: §a%,d §7(§a%s§7)
2878+
2879+
gregtech.recipe.total=Total: %,d EU
2880+
gregtech.recipe.eu=Usage: %,d EU/t (%s)
2881+
gregtech.recipe.eu_inverted=Generation: %,d EU/t
2882+
gregtech.recipe.duration=Duration: %,.1f secs
2883+
gregtech.recipe.amperage=Amperage: %,d
28842884
gregtech.recipe.not_consumed=Not consumed in process
28852885
gregtech.recipe.chance=Chance: %s%% +%s%%/tier
2886-
gregtech.recipe.blast_furnace_temperature=Temperature: %dK
2887-
gregtech.recipe.eu_to_start=Energy To Start: %dEU
2886+
gregtech.recipe.blast_furnace_temperature=Temperature: %,dK
2887+
gregtech.recipe.eu_to_start=Energy To Start: %,dEU
28882888

28892889
gregtech.fluid.click_to_fill=§7Click with a empty fluid container to fill it from tank.
28902890
gregtech.fluid.click_to_fill.shift=§7(Shift-clicking will fill all containers in your hand)
@@ -2895,7 +2895,7 @@ gregtech.fluid.click_to_empty.shift=§7(Shift-clicking will empty all containers
28952895
gregtech.fluid.plasma=%s Plasma
28962896
gregtech.fluid.empty=Empty
28972897
gregtech.fluid.amount=§7%,d/%,d
2898-
gregtech.fluid.temperature=§7Temperature: %dK
2898+
gregtech.fluid.temperature=§7Temperature: %,dK
28992899
gregtech.fluid.state_gas=§7State: Gaseous
29002900
gregtech.fluid.state_liquid=§7State: Liquid
29012901
gregtech.gui.fuel_amount=Fuel Amount:
@@ -2923,12 +2923,12 @@ gregtech.jei.ore.biome_weighting_no_spawn=%s Weight: Cannot Spawn
29232923
gregtech.item_filter.empty_item=Empty (No Item)
29242924
gregtech.item_filter.footer=§eClick with item to override
29252925

2926-
gregtech.cable.voltage=Voltage: §a%d §7(§a%s§7)
2927-
gregtech.cable.amperage=Amperage: §e%d
2928-
gregtech.cable.loss_per_block=Loss per block: §c%d
2926+
gregtech.cable.voltage=Voltage: §a%,d §7(§a%s§7)
2927+
gregtech.cable.amperage=Amperage: §e%,d
2928+
gregtech.cable.loss_per_block=Loss per block: §c%,d
29292929

2930-
gregtech.fluid_pipe.throughput=Transfer: §e%d mb/t
2931-
gregtech.fluid_pipe.max_temperature=Max Temperature: §c%dK
2930+
gregtech.fluid_pipe.throughput=Transfer: §e%,d mb/t
2931+
gregtech.fluid_pipe.max_temperature=Max Temperature: §c%,dK
29322932
gregtech.fluid_pipe.non_gas_proof=Can't transfer gases.
29332933

29342934
gregtech.multiblock.work_paused=Work Paused.

0 commit comments

Comments
 (0)