diff --git a/src/main/java/slimeknights/tconstruct/plugin/jei/modifiers/ModifierRecipeCategory.java b/src/main/java/slimeknights/tconstruct/plugin/jei/modifiers/ModifierRecipeCategory.java index 32aee27d400..302a3c3a097 100644 --- a/src/main/java/slimeknights/tconstruct/plugin/jei/modifiers/ModifierRecipeCategory.java +++ b/src/main/java/slimeknights/tconstruct/plugin/jei/modifiers/ModifierRecipeCategory.java @@ -211,7 +211,7 @@ public List getTooltipStrings(IDisplayModifierRecipe recipe, IRecipeS if (count == 1) { return Collections.singletonList(Component.translatable(KEY_SLOT, slots.type().getDisplayName())); } else if (count > 1) { - return Collections.singletonList(Component.translatable(KEY_SLOTS, slots, slots.type().getDisplayName())); + return Collections.singletonList(Component.translatable(KEY_SLOTS, slots.count(), slots.type().getDisplayName())); } } else { return TEXT_FREE; diff --git a/src/main/java/slimeknights/tconstruct/tools/modifiers/traits/DamageSpeedTradeModifier.java b/src/main/java/slimeknights/tconstruct/tools/modifiers/traits/DamageSpeedTradeModifier.java index 9d7c71f3202..e369d2a3d78 100644 --- a/src/main/java/slimeknights/tconstruct/tools/modifiers/traits/DamageSpeedTradeModifier.java +++ b/src/main/java/slimeknights/tconstruct/tools/modifiers/traits/DamageSpeedTradeModifier.java @@ -35,7 +35,7 @@ * Shared logic for jagged and stonebound. Trait boosts attack damage as it lowers mining speed. */ public class DamageSpeedTradeModifier extends Modifier implements AttributesModifierHook, TooltipModifierHook, BreakSpeedModifierHook { - private static final Component MINING_SPEED = TConstruct.makeTranslation("modifier", "fake_attribute.mining_speed"); + private static final Component MINING_SPEED = TConstruct.makeTranslation("armor_stat", "mining_speed"); private final float multiplier; private final Lazy uuid = Lazy.of(() -> UUID.nameUUIDFromBytes(getId().toString().getBytes())); private final Lazy attributeName = Lazy.of(() -> { diff --git a/src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java b/src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java index 4a7778e3cce..9d5fbfbaf9a 100644 --- a/src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java +++ b/src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java @@ -76,7 +76,7 @@ public class EnchantmentConvertingRecipe extends AbstractWorktableRecipe { public EnchantmentConvertingRecipe(ResourceLocation id, String name, List inputs, boolean matchBook, boolean returnInput, IJsonPredicate modifierPredicate) { super(id, inputs); this.name = name; - this.title = Component.translatable(ModifierRemovalRecipe.BASE_KEY + "." + name); + this.title = Component.translatable(ExtractModifierRecipe.BASE_KEY + "." + name); this.matchBook = matchBook; this.returnInput = returnInput; this.modifierPredicate = modifierPredicate; diff --git a/src/main/java/slimeknights/tconstruct/tools/recipe/ExtractModifierRecipe.java b/src/main/java/slimeknights/tconstruct/tools/recipe/ExtractModifierRecipe.java index 696cef07331..a0236c378bd 100644 --- a/src/main/java/slimeknights/tconstruct/tools/recipe/ExtractModifierRecipe.java +++ b/src/main/java/slimeknights/tconstruct/tools/recipe/ExtractModifierRecipe.java @@ -23,7 +23,7 @@ /** Recipe that removes a modifier, placing it on a crystal for reapplication */ public class ExtractModifierRecipe extends ModifierRemovalRecipe { - private static final String BASE_KEY = TConstruct.makeTranslationKey("recipe", "extract_modifier"); + public static final String BASE_KEY = TConstruct.makeTranslationKey("recipe", "extract_modifier"); private static final Component DESCRIPTION = TConstruct.makeTranslation("recipe", "extract_modifier.description"); private static final Component NO_MODIFIERS = TConstruct.makeTranslation("recipe", "extract_modifier.no_modifiers"); diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/boots/tconstruct_double_jump.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/boots/tconstruct_double_jump.json index 33587d227d0..97ef2caa494 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/boots/tconstruct_double_jump.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/boots/tconstruct_double_jump.json @@ -8,6 +8,6 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot" + "Requires 1 ability slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/chestplate/tconstruct_ambidextrous.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/chestplate/tconstruct_ambidextrous.json index e596f00744b..94f8c5ed435 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/chestplate/tconstruct_ambidextrous.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/chestplate/tconstruct_ambidextrous.json @@ -2,7 +2,7 @@ "modifier_id": "tconstruct:ambidextrous", "text": [ { - "text": "Allows allows punching with the offhand. Offhand will receive all unarmed boosts applied to the main hand." + "text": "Allows punching with the offhand. Offhand will receive all unarmed boosts applied to the main hand." } ], "more_text_space": true, diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_bursting.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_bursting.json index ec67cbc5896..5ef262380fd 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_bursting.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_bursting.json @@ -11,7 +11,7 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot", + "Requires 1 ability slot per level", "Fill by using tool on a fluid tank" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_protection.json index 44817443bb4..341b722260f 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_protection.json @@ -8,6 +8,6 @@ "more_text_space": true, "effects": [ "Maximum of 1 level", - "Requires 1 ability slot per level" + "Requires 1 ability slot" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_wetting.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_wetting.json index 2baa46dd584..065502d5ebd 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_wetting.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/general/tconstruct_wetting.json @@ -11,7 +11,7 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot", + "Requires 1 ability slot per level", "Fill by using tool on a fluid tank" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/helmet/tconstruct_slurping.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/helmet/tconstruct_slurping.json index eae47fdbf78..006bbd0c2d7 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/helmet/tconstruct_slurping.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/helmet/tconstruct_slurping.json @@ -11,7 +11,7 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot", + "Requires 1 ability slot per level", "Fill by using tool on a fluid tank" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/leggings/tconstruct_pockets.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/leggings/tconstruct_pockets.json index 8fb25537986..94dbd05942b 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/leggings/tconstruct_pockets.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/leggings/tconstruct_pockets.json @@ -8,6 +8,6 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot" + "Requires 1 ability slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/shield/tconstruct_boundless.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/shield/tconstruct_boundless.json index 93bcb70ef06..09645274ef6 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/shield/tconstruct_boundless.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/armor/shield/tconstruct_boundless.json @@ -8,6 +8,6 @@ "more_text_space": true, "effects": [ "Maximum of 1 level", - "Requires 1 ability slot per level" + "Requires 1 ability slot" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/melee/tconstruct_spilling.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/melee/tconstruct_spilling.json index 3a9c432d3d7..0afb2f7dc44 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/melee/tconstruct_spilling.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/melee/tconstruct_spilling.json @@ -11,7 +11,7 @@ "more_text_space": true, "effects": [ "No max level", - "Requires 1 ability slot", + "Requires 1 ability slot per level", "Fill by using tool on a fluid tank" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/tconstruct_multishot.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/tconstruct_multishot.json index 9ae7c269537..86b5ae16fff 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/tconstruct_multishot.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/abilities/ranged/tconstruct_multishot.json @@ -5,7 +5,7 @@ "text": "Allows shooting 2 additional arrows per level. Additional arrows location may vary based on the bow." }, { - "text": "Must have additionall arrows in the inventory to fire them, if too few the bow will shoot fewer arrows.", + "text": "Must have additional arrows in the inventory to fire them, if too few the bow will shoot fewer arrows.", "paragraph": true } ], diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/info.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/info.json index f81ea83aec1..6ae52645830 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/info.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/armor/info.json @@ -1,6 +1,6 @@ { "title": "Armor Information", "text": [ - { "text": "Armor is crafted in the Crafting Station instead of the Tinker Station or Anvil. All pieces start with 1 ability slot, but have varying number of upgrade and ability slots. Unlike tools, most modifiers require wearing the armor to be applicable." } + { "text": "Armor is crafted in the Crafting Station instead of the Tinker Station or Anvil. Armor have varying number of upgrade, defense, and ability slots based on the type; some types even have material traits. Unlike tools, holding the armor typically provides no effect; most modifiers require wearing the armor to be applicable." } ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_blast_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_blast_protection.json index cf535230b0a..c57df9bb8f7 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_blast_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_blast_protection.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_dragonborn.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_dragonborn.json index a50996b8381..a9661d976c6 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_dragonborn.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_dragonborn.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_fire_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_fire_protection.json index 44f6407ef3c..e69d4e27865 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_fire_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_fire_protection.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_magic_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_magic_protection.json index 684effe9ba1..3efa725e460 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_magic_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_magic_protection.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_melee_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_melee_protection.json index 263b06cbe10..0f9e6985318 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_melee_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_melee_protection.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_projectile_protection.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_projectile_protection.json index a7603ee6999..1480907f283 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_projectile_protection.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_projectile_protection.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_shulking.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_shulking.json index 2155070a030..1f2041003a0 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_shulking.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_shulking.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_turtle_shell.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_turtle_shell.json index 9ace013f85c..cfa9b699a3c 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_turtle_shell.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/protection/tconstruct_turtle_shell.json @@ -11,6 +11,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Requires 1 defense slot" + "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/tconstruct_revitalizing.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/tconstruct_revitalizing.json index 424825f3101..4df9040aa22 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/tconstruct_revitalizing.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/defense/special/tconstruct_revitalizing.json @@ -8,7 +8,6 @@ "more_text_space": true, "effects": [ "Can apply levels incrementally", - "Maximum of 5 levels", "Requires 1 defense slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/foreward.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/foreward.json index 768b5576f01..08be9f1cf03 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/foreward.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/foreward.json @@ -1,5 +1,5 @@ { - "title": "Foreward", + "title": "Foreword", "text": [ { "text": "During my research into tool making, I noticed several authors have created partial lists of materials but there was no one complete list. This means in order to properly compare all the materials, it is necessary to switch between several volumes. This book is intended to solve that problem by indexing known materials from several different volumes into a single book." diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_broad_axe.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_broad_axe.json index 8033485f2c4..1d0c93e82fd 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_broad_axe.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_broad_axe.json @@ -2,7 +2,7 @@ "tool": "tconstruct:broad_axe", "text": [ { "text": "The Broad Axe can mine a single column of a tree, or 6 blocks in a vertical column." }, - { "text": "Expanders alternate between width and depth.", "paragraph": true } + { "text": "Expanders alternate between increasing width and depth.", "paragraph": true } ], "properties": [ "+5 Attack Damage", diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_cleaver.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_cleaver.json index 355dcde35a8..19f1b83d458 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_cleaver.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_cleaver.json @@ -9,6 +9,6 @@ "150% Attack Multiplier", "1.0 Attack Speed", "350% Durability Multiplier", - "Beheading II" + "Severing II" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_longbow.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_longbow.json index 82e96c71452..e321421ab49 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_longbow.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_longbow.json @@ -10,6 +10,6 @@ "1.00 Arrow Velocity", "0.75 Accuracy", "Sums stats of both limbs", - "150% Durability" + "150% Durability Multiplier" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_scythe.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_scythe.json index eefa5ba2ded..0c869b5e5cd 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_scythe.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_scythe.json @@ -2,7 +2,7 @@ "tool": "tconstruct:scythe", "text": [ { "text": "The Scythe is a broad reaping tool, effective on plants or monsters in a 3x3x3 range." }, - { "text": "Expanders alternate between width/height and depth, while silky grants AOE shearing.", "paragraph": true } + { "text": "Expanders alternate between increasing width/height and depth, while silky grants AOE shearing.", "paragraph": true } ], "properties": [ "+1 Attack Damage", diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_vein_hammer.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_vein_hammer.json index b1a7c063b91..7cb5d1f499a 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_vein_hammer.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/broad/tconstruct_vein_hammer.json @@ -9,7 +9,7 @@ "125% Attack Multiplier", "0.85 Attack Speed", "30% Mining Multiplier", - "500% Durability", + "500% Durability Multiplier", "Piercing II" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/tconstruct_crossbow.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/tconstruct_crossbow.json index 3f9be7a1855..7238e3aa0a5 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/tconstruct_crossbow.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/small/tconstruct_crossbow.json @@ -9,6 +9,6 @@ "1.0 Draw Speed", "1.00 Arrow Velocity", "0.75 Accuracy", - "200% Durability" + "200% Durability Multiplier" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/leggings/tconstruct_shield_strap.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/leggings/tconstruct_shield_strap.json index a278e1a46a5..349f9401a7f 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/leggings/tconstruct_shield_strap.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/leggings/tconstruct_shield_strap.json @@ -7,6 +7,6 @@ ], "more_text_space": true, "effects": [ - "Requires 1 upgrade slot" + "Requires 1 upgrade slot per level" ] } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/general.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/general.json index 2a1484e9291..787583b8965 100644 --- a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/general.json +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/general.json @@ -1,5 +1,5 @@ { - "title": "General upgrades", + "title": "General Upgrades", "text": [ { "text": "General modifiers are effective on multiple types of tools, including melee and harvest tools along with armor." }, { "text": "Some modifiers are only to melee and harvest, so check the list of tools displayed.", "paragraph": true } diff --git a/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/modifiers/abilities.json b/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/modifiers/abilities.json index 611b8ed7979..dd44993b078 100644 --- a/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/modifiers/abilities.json +++ b/src/main/resources/assets/tconstruct/book/materials_and_you/en_us/modifiers/abilities.json @@ -14,7 +14,7 @@ "text": "Abilities are powerful modifiers that drastically change a tool. Modifiers such as silky and autosmelt are notable as both change the effects of mining blocks, while dual wielding makes tools much easier to handle. " }, { - "text": "Nearly all tools start with a single ability slot, and can only receive up to 1 more, so choose abilities wisely." + "text": "Nearly all tools start with a single ability slot, and can only receive up to 2 more, so choose abilities wisely." }, { "text": "Thruul M'Gon's Mighty Smelting has a full list of abilities available on tools, along with the Encyclopedia of Tinkering.", diff --git a/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/staffs/tconstruct_sky_staff.json b/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/staffs/tconstruct_sky_staff.json index 99aeda0c0ae..cc81142e225 100644 --- a/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/staffs/tconstruct_sky_staff.json +++ b/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/staffs/tconstruct_sky_staff.json @@ -1,7 +1,7 @@ { "tool": "tconstruct:sky_staff", "text": [ - { "text": "Skyslime staffs leave a lot of room for modification. Grants hire drawspeed at the cost of projectile power." } + { "text": "Skyslime staffs leave a lot of room for modification. Grants higher drawspeed at the cost of projectile power." } ], "properties": [ "Low Durability", diff --git a/src/main/resources/assets/tconstruct/lang/en_us.json b/src/main/resources/assets/tconstruct/lang/en_us.json index 1f70ad6a1c5..de44b7d79e6 100644 --- a/src/main/resources/assets/tconstruct/lang/en_us.json +++ b/src/main/resources/assets/tconstruct/lang/en_us.json @@ -1530,7 +1530,7 @@ "material.tconstruct.iron.flavor": "Ironic. He could save others from death, but not himself.", "material.tconstruct.iron.encyclopedia": "Causes mining blocks and hitting mobs to attract nearby items.", "material.tconstruct.iron.ranged": "Causes firing arrows to attract nearby items to the holder.", - "material.tconstruct.iron.armor": "Reduces damage from projectiles by 10% per level, and grants 5% projectile protection based on the max level.", + "material.tconstruct.iron.armor": "Reduces damage from projectiles by 10% per level, and grants 5% knockback resistance times the max level.", "material.tconstruct.iron.skull_flavor": "Violation of quarantine", "material.tconstruct.iron.skull_encyclopedia": "Melee attacks copy all negative status effects from the wearer to the target", @@ -1622,7 +1622,7 @@ "material.tconstruct.manyullyn.flavor": "The metal that most Tinkers will never pronounce right. Also known as a star cutting material.", "material.tconstruct.manyullyn.encyclopedia": "Grants +2 damage per level after 8 consecutive hits", "material.tconstruct.manyullyn.ranged": "Arrows gain +1 damage per level (before velocity) after 8 consecutive arrow hits", - "material.tconstruct.manyullyn.armor": "Temporarily boosts melee damge by 1 after taking damage, capping at the total level across all armor", + "material.tconstruct.manyullyn.armor": "Temporarily boosts melee damage by 1 after taking damage, capping at the total level across all armor", "material.tconstruct.hepatizon": "Hepatizon", "material.tconstruct.hepatizon.flavor": "He-pa-ti-zon - boil it, mash it, put it in a stew.", @@ -1728,7 +1728,7 @@ "material.tconstruct.silver.flavor": "You know, this tool isn't going to look so shiny in a few days.", "material.tconstruct.silver.encyclopedia": "Gives +2.5 damage against undead per level", "material.tconstruct.silver.ranged": "Gives +0.5 projectile power against undead per level", - "material.tconstruct.silver.armor": "Reduces dmage from undead by 5% per level", + "material.tconstruct.silver.armor": "Reduces damage from undead by 5% per level", "material.tconstruct.whitestone": "Whitestone", "material.tconstruct.whitestone.end": "End Stone", @@ -1764,7 +1764,7 @@ "material.tconstruct.invar.flavor": "Resists both temperature and arrest.", "material.tconstruct.invar.encyclopedia": "Grants +2.5 damage in biomes with neutral temperatures", "material.tconstruct.invar.ranged": "Grants +0.15 accuracy in biomes with neutral temperatures", - "material.tconstruct.invar.armor": "Redudes damage by 5% per level in biomes with neutral temperatures", + "material.tconstruct.invar.armor": "Reduces damage by 5% per level in biomes with neutral temperatures", "material.tconstruct.electrum": "Electrum", "material.tconstruct.electrum.flavor": "Good for electronic components.", @@ -2431,7 +2431,7 @@ "modifier.tconstruct.crystalbound.description": "Bows gain bonus velocity, but arrow angle is restricted", "modifier.tconstruct.crystalstrike": "Crystalstrike", "modifier.tconstruct.crystalstrike.flavor": "Speed of the crystal comes at a cost", - "modifier.tconstruct.crystalstrike.description": "Armor instead gains attack speed by restricting knockback angle", + "modifier.tconstruct.crystalstrike.description": "Increases attack speed but also restricts knockback angles", "modifier.tconstruct.lightweight": "Lightweight", "modifier.tconstruct.lightweight.flavor": "Like a Shardblade!", "modifier.tconstruct.lightweight.description": "Tool is incredibly light for its size, allowing you to attack, mine, and launch projectiles faster", @@ -3077,9 +3077,9 @@ "advancements.tconstruct.smeltery.melter.title": "Basic Meltery", "advancements.tconstruct.smeltery.melter.description": "Make a basic melting setup with a melter, a heater or tank, a casting basin, a casting table, and a faucet", "advancements.tconstruct.smeltery.sand_casting.title": "Sand Casting", - "advancements.tconstruct.smeltery.sand_casting.description": "Make a basic disposable casts out of sand", + "advancements.tconstruct.smeltery.sand_casting.description": "Make a basic disposable cast out of sand", "advancements.tconstruct.smeltery.gold_casting.title": "Shiny Casts", - "advancements.tconstruct.smeltery.gold_casting.description": "Make a reusable casts out of gold", + "advancements.tconstruct.smeltery.gold_casting.description": "Make a reusable cast out of gold", "advancements.tconstruct.smeltery.cast_collector.title": "Cast Collector", "advancements.tconstruct.smeltery.cast_collector.description": "Collect one of each gold cast", "advancements.tconstruct.smeltery.mighty_smelting.title": "Smelting 201",