diff --git a/docs/marketplace/Addons/tinkers/Docs/Getting Started/index.md b/docs/marketplace/Addons/tinkers/Docs/Getting Started/index.md index 0b0c09a0..c7cf19e7 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Getting Started/index.md +++ b/docs/marketplace/Addons/tinkers/Docs/Getting Started/index.md @@ -77,4 +77,14 @@ Once you've meticulously crafted all the parts, head over to the Tinker Station. While advanced modifications aren't available in the current version, keep your eyes peeled for future updates. The possibilities for customization are bound to expand! -*For Weapons like Swords or Cleavers, you will need a Tinkers' Anvil.* \ No newline at end of file +*For Weapons like Swords or Cleavers, you will need a Tinkers' Anvil.* + +### Tin Ore + +Tinkers' Construct 3.0 introduces Tin as a new material. Tin One can be found deep underground, typically in the same layers where Copper One generates. + +While Tin has a few uses, its primary purpose is to be combined with Copper to create the Bronze alloy. + +Other uses include crafting Tin Cans and decorative Tin Blocks. + +Tin comes in several forms: Raw Tin, Tin Nuggets, Tin Ingots, Tin Blocks, and Raw Tin Blocks. diff --git a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1.md b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1.md index 77a9d2a6..1d994117 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1.md +++ b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1.md @@ -19,53 +19,52 @@ Here's all the Tier 1 Materials: ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_wood.png) ![Axe Head](../../_assets/images/parts/axe_head_wood.png) ![Shoel Head](../../_assets/images/parts/shoel_head_wood.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_wood.png) ![Sword Blade](../../_assets/images/parts/sword_blade_wood.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_wood.png) **Tool Head** -- Durabilty: 60 -- Harvest Tier: Wood -- Mining Speed: 2 -- Attack Damage: 0 -- Trait: Cultivation +- Durabilty: **55** +- Harvest Tier: **Wood** +- Mining Speed: **2.25** +- Attack Damage: **1.05** +- Trait: **Cultivation** **Tool Handle/Guard** -- Durabilty: 1x -- Attack Damage: 1x - -**Trait**: Cultivation +- Durabilty: **0.75x** +- Mining Speed: **0.7x** +- Attack Damage: **0.5x** +- Trait: **Cultivation** ### Stone ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_stone.png) ![Axe Head](../../_assets/images/parts/axe_head_stone.png) ![Shoel Head](../../_assets/images/parts/shoel_head_stone.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_stone.png) ![Sword Blade](../../_assets/images/parts/sword_blade_stone.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_stone.png) **Tool Head** -- Durabilty: 130 -- Harvest Tier: Stone -- Mining Speed: 4 -- Attack Damage: 1 +- Durabilty: **125** +- Harvest Tier: **Stone** +- Mining Speed: **3.5** +- Attack Damage: **1.25** +- Trait: **Summoner** **Tool Handle/Guard** -- Durabilty: 0.9x -- Attack Damage: 1x - -**Trait**: Summoner +- Durabilty: **0.6x** +- Mining Speed: **1.2x** +- Attack Damage: **1x** +- Trait: **Summoner** ### Bone ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_bone.png) ![Axe Head](../../_assets/images/parts/axe_head_bone.png) ![Shoel Head](../../_assets/images/parts/shoel_head_bone.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_bone.png) ![Sword Blade](../../_assets/images/parts/sword_blade_bone.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_bone.png) **Tool Head** -- Durabilty: 100 -- Harvest Tier: Stone -- Mining Speed: 2.5 -- Attack Damage: 1.25 -- Trait: Undead +- Durabilty: **100** +- Harvest Tier: **Stone** +- Mining Speed: **2.5** +- Attack Damage: **1.25** +- Trait: **Undead** **Tool Handle/Guard** -- Durabilty: 0.75x -- Attack Damage: 1x - -**Trait**: Undead +- Durabilty: **0.75x** +- Mining Speed: **1x** +- Attack Damage: **1x** +- Trait: **Undead** ### String ![Binding](../../_assets/images/parts/binding_string.png) **Binding** - Holds your tools together. - -**Trait**: Stringy \ No newline at end of file diff --git a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1_traits.md b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1_traits.md index 2fba921d..dd7b3499 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1_traits.md +++ b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tier_1_traits.md @@ -10,14 +10,10 @@ sidebar_position: 5 Materials have special abilities called traits. Here are the Tier 1 Traits: - - [**Stringy**](./tier_1_traits.md#stringy) - [**Cultivation**](./tier_1_traits.md#cultivation) - [**Summoner**](./tier_1_traits.md#summoner) - [**Undead**](./tier_1_traits.md#undead) -### Stringy - - Spiders and sheep will now drop string when defeated. - ### Cultivation - Increases the chance of obtaining more items from crops when harvesting. @@ -25,4 +21,4 @@ Here are the Tier 1 Traits: - Stone and End Stone have a rare chance to spawn Silverfish and Endermites, respectively. ### Undead -- Striking undead mobs like zombies and husks transforms them into skeletons. Additionally, all defeated mobs now drop bones and bonemeal. \ No newline at end of file +- Striking undead mobs like zombies and husks transforms them into skeletons. Additionally, all defeated mobs now drop bones and bonemeal. diff --git a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tool_repairs.md b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tool_repairs.md index 239b7c02..ab4c83e8 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tool_repairs.md +++ b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tool_repairs.md @@ -16,7 +16,12 @@ Here are the Tier 1 Traits: ### Repair Kits -![Repair Kit Recipe](../../_assets/images/tinkers-repair_kit_recipe.png) +```crafting table,Part Builder +- cobblestone - +cobblestone ftbtc:item/pattern_repair_kit cobblestone +- cobblestone - +result: ftbtc:item/stone_repair_kit +``` Use tool repair kits to restore the health of your weapons and tools. @@ -42,4 +47,4 @@ This will consume the repair kit and restore the durability of your tool. *Additionally, helpful notifications will appear as your tool's durability drops, warning you when it reaches 25, 10 and 1 durability remaining. Aim to repair your tools before they break completely.* -![Repair Kit Off-hand](../../_assets/images/tinkers-repair_kit_offhand.webp) \ No newline at end of file +![Repair Kit Off-hand](../../_assets/images/tinkers-repair_kit_offhand.webp) diff --git a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tools.md b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tools.md index c9502ccb..4957347f 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Getting Started/tools.md +++ b/docs/marketplace/Addons/tinkers/Docs/Getting Started/tools.md @@ -18,6 +18,14 @@ Here's a breakdown of the tools you can create: - [**Dagger**](./tools.md#dagger) - [**Sword**](./tools.md#sword) - [**Cleaver**](./tools.md#cleaver) + - [**Bow**](./tools.md#bow) + +## Damage + +Tinkers' Construct handles tool damage a bit differently. +When you hover over a tool, you'll find its current damage displayed at the bottom of the tooltip. + +Additionally, helpful notifications Will appear as your tool's durability drops, warning you when it reaches 10 and 1 durability remaining. ### Pickaxe @@ -87,4 +95,24 @@ This colossal cleaver isn't just for combat; it's a true warrior's multi-tool. Not only does it function as the ultimate defense against mobs, but its legendary sharpness allows you to collect mob heads, perfect for crafting and decorating. -*Requires the Tinkers' Anvil to craft.* \ No newline at end of file +*Requires the Tinkers' Anvil to craft.* + +### Bow + +The Bow's Big Brother: The humble bow is a classic choice for ranged attacks. + +But Tinker's' Bows ane the real deal! With a variety of materials and unique abilities, you can create bows that pack a serious punch. + +*Bows are incompatible with Modifiers. + +Like other tools, Bows can be crafted at the Tinker's Station. + +The crafting recipe is a variation of the vanilla bow recipe. +Simply replace the Sticks with 3 Tool Handles of the same type. + +```crafting table,Tinker's Station +- ftbtc:item/large_handle_bone string +ftbtc:item/large_handle_bone - string +- ftbtc:item/large_handle_bone string +result: ftbtc:item/bone_bow, 1 +``` diff --git a/docs/marketplace/Addons/tinkers/Docs/Melting & More/index.md b/docs/marketplace/Addons/tinkers/Docs/Melting & More/index.md index 1fd2c3f1..c4d8e70e 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Melting & More/index.md +++ b/docs/marketplace/Addons/tinkers/Docs/Melting & More/index.md @@ -79,4 +79,17 @@ Seared Bricks in a Flash: *Crafted in a Crafting Table.* -**Tip:** *Pop these blocks in a Stonecutter for even more design options!* \ No newline at end of file +**Tip:** *Pop these blocks in a Stonecutter for even more design options!* + +#### Seared Faucet + +![Seared Faucet Recipe](../../_assets/images/tinkers-seared_faucet_recipe.png) + +For quick and direct pouring of molten liquid into Casting Tables and Basins, Seared Faucets are significantly faster than using cans. + +Provided the liquid doesn't need to be moved or stored. + +How to use: +1. Place a Faucet on the side of a Melter or Seared Drain. +2. Place either a Casting Table or Basin below it. +3. Interact with the Faucet to pour it out. diff --git a/docs/marketplace/Addons/tinkers/Docs/Melting & More/melter.md b/docs/marketplace/Addons/tinkers/Docs/Melting & More/melter.md index 4fdbec51..d21c29a3 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Melting & More/melter.md +++ b/docs/marketplace/Addons/tinkers/Docs/Melting & More/melter.md @@ -13,6 +13,7 @@ This is your basic Melter, perfect for getting started with simple tasks. ### How to use +**Master the Melter:** This handy tool has two parts in one: the heater and the tank. **Fuel Up:** @@ -29,4 +30,4 @@ While fueled, interact with raw ore (like iron), and Watch as the molten metal f - Iron - Gold - Pig Iron -- Rose Gold \ No newline at end of file +- Rose Gold diff --git a/docs/marketplace/Addons/tinkers/Docs/Melting & More/moving_liquids.md b/docs/marketplace/Addons/tinkers/Docs/Melting & More/moving_liquids.md index bc27285b..cfbe1d4c 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Melting & More/moving_liquids.md +++ b/docs/marketplace/Addons/tinkers/Docs/Melting & More/moving_liquids.md @@ -11,15 +11,15 @@ You've got the hang of melting, Tinker! Now, the burning question: how do we get ![Cans and Melter](../../_assets/images/tinkers-cans_and_melter.webp) -### Iron and Copper Cans +### Tin and Copper Cans Need to transport, store, or pour your freshly melted liquids? ![Cans Recipe](../../_assets/images/tinkers-cans_recipe.png) -Look no further than Iron & Copper Cans! +Look no further than Tin & Copper Cans! -**Iron Cans** hold one-tenth the volume of a bucket, offering a tiny *100mB (or 100 millibuckets)* of storage. +**Tin Cans** hold one-tenth the volume of a bucket, offering a tiny *100mB (or 100 millibuckets)* of storage. However, **Copper Cans** hold one-fifth the volume of a bucket, offering a convenient *200mB* of storage. @@ -31,4 +31,4 @@ For larger volumes of molten liquids, consider using **Buckets**. ![Bucket Recipe](../../_assets/images/tinkers-bucket_recipe.png) -They offer a generous *1000mB* of capacity, making them four times larger than copper cans. \ No newline at end of file +They offer a generous *1000mB* of capacity, making them four times larger than copper cans. diff --git a/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2.md b/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2.md index 2d705a81..2d117a35 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2.md +++ b/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2.md @@ -5,7 +5,7 @@ sidebar_position: 12 ![Tier 2 Materials](../../_assets/images/tinkers-tier_2_materials.png) -## Tier 1 Materials +## Tier 2 Materials Use these materials to craft parts for your melee weapons and harvest tools! @@ -23,13 +23,30 @@ Here's all the Tier 2 Materials: - Harvest Tier: Iron - Mining Speed: 5 - Attack Damage: 1.75 +- Trait: **Magnetic** **Tool Handle/Guard** - Durability: 1.05x - Mining Speed: 0.85x - Attack Damage: 1.05x +- Trait: **Magnetic** -**Trait**: Magnetic +### Bronze +![Pickaxe Head](../../_assets/images/parts/pickaxe_head_bronze.png) ![Axe Head](../../_assets/images/parts/axe_head_bronze.png) ![Shoel Head](../../_assets/images/parts/shoel_head_bronze.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_bronze.png) ![Sword Blade](../../_assets/images/parts/sword_blade_bronze.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_bronze.png) + + +**Tool Head** +- Durability: 380 +- Harvest Tier: Diamond +- Mining Speed: 5 +- Attack Damage: 1.75 +- Trait: **Reinforced** + +**Tool Handle/Guard** +- Durability: 1.05x +- Mining Speed: 0.85x +- Attack Damage: 1.05x +- Trait: **Reinforced** ### Gold ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_gold.png) ![Axe Head](../../_assets/images/parts/axe_head_gold.png) ![Shoel Head](../../_assets/images/parts/shoel_head_gold.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_gold.png) ![Sword Blade](../../_assets/images/parts/sword_blade_gold.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_gold.png) @@ -39,13 +56,13 @@ Here's all the Tier 2 Materials: - Harvest Tier: Gold - Mining Speed: 9.5 - Attack Damage: 0.75 +- Trait: **Speed** **Tool Handle/Guard** - Durability: 0.25x - Mining Speed: 2.5x - Attack Damage: 0.5x - -**Trait**: Speed +- Trait: **Speed** ### Pig Iron ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_pig_iron.png) ![Axe Head](../../_assets/images/parts/axe_head_pig_iron.png) ![Shoel Head](../../_assets/images/parts/shoel_head_pig_iron.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_pig_iron.png) ![Sword Blade](../../_assets/images/parts/sword_blade_pig_iron.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_pig_iron.png) @@ -55,13 +72,13 @@ Here's all the Tier 2 Materials: - Harvest Tier: Diamond - Mining Speed: 6 - Attack Damage: 2.5 +- Trait: **Tasty** **Tool Handle/Guard** - Durability: 1.1x - Mining Speed: 0.85x - Attack Damage: 1.1x - -**Trait**: Tasty +- Trait: **Tasty** ### Rose Gold ![Pickaxe Head](../../_assets/images/parts/pickaxe_head_rose_gold.png) ![Axe Head](../../_assets/images/parts/axe_head_rose_gold.png) ![Shoel Head](../../_assets/images/parts/shoel_head_rose_gold.png) ![Dagger Blade](../../_assets/images/parts/dagger_blade_rose_gold.png) ![Sword Blade](../../_assets/images/parts/sword_blade_rose_gold.png) ![Cleaver Blade](../../_assets/images/parts/cleaver_blade_rose_gold.png) @@ -71,10 +88,10 @@ Here's all the Tier 2 Materials: - Harvest Tier: Gold - Mining Speed: 9 - Attack Damage: 1 +- Trait: **Experienced** **Tool Handle/Guard** - Durability: 0.6x - Mining Speed: 1.2x - Attack Damage: 1x - -**Trait**: Experienced \ No newline at end of file +- Trait: **Experienced** diff --git a/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2_traits.md b/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2_traits.md index cae6497d..f2eba7f7 100644 --- a/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2_traits.md +++ b/docs/marketplace/Addons/tinkers/Docs/Melting & More/tier_2_traits.md @@ -26,3 +26,6 @@ Here are the Tier 2 Traits: ### Experienced - Increases the amount of experience you get from defeating mobs and mining ores. + +### Reinforced +- Each use has a 20% chance to avoid consuming durability. diff --git a/docs/marketplace/Addons/tinkers/Docs/Modifiers/index.md b/docs/marketplace/Addons/tinkers/Docs/Modifiers/index.md new file mode 100644 index 00000000..fc8074cd --- /dev/null +++ b/docs/marketplace/Addons/tinkers/Docs/Modifiers/index.md @@ -0,0 +1,77 @@ +--- +title: Modifiers +--- + +Modifiers grant unique abilities to your tools and weapons, though strangely, they don't seem to work with any throwable items. + +### Modifier Template + +The first step is to learn how to create a Modifier Template. Think of this as the foundation for all your future Modifiers. +![Modifier Template](../../_assets/images/tinkers-modifiers-template.png) + +## Crafting modifiers + +To create any Modifier, we always start with a Modifier Template and surround it with the required materials. + +For example, to make an Explosive Modifier, we'll infuse the Template with TNT and Gunpowder. + +*All recipes can be crafted at a Crafting Table. + +![Explosive Modifier](../../_assets/images/tinkers-tnt-modifier.png) + +--- + +All Modifiers will be displayed in the in-game crafting menu for easy access. + +Simply search for 'Modifier' or use a Modifier Template to view available options. + +![Modifier Menu](../../_assets/images/tinkers-modifiers-crafting-ui.png) + + +### Modifiers + +- Bane + - Adds the "Bane of the Arthropods" Enchant, Can be stacked. Just swords and axes. Max level 3. +- Bright + - A light source follows the player while equiped. Can not be used with "Soaked" or "Sponged". +- Electrifying + - A chance to summon lightning when hitting mobs. Can only be used on swords. +- Explosive + - Gives the ability to mine a 3x3 area. Can not be used with "Ultimine". Can only be used on Pickaxes. +- Lucky + - Adds the "Looting/Fortune" Enchant. Max level 3. Can't be used with Silk Touch. +- Pushed + - Adds the "Knockback" Enchant, Can be stacked. Can only be used on Daggers, Swords or Cleavers. Max level 2. +- Rapid + - Adds the "Haste" Enchant, Can be stacked. Can not be used on throwables or slings. Max level 3 +- Reinforced + - Adds the "Unbreaking" Enchant, Can be stacked. Can not be used on throwables or slings. Max level 3. +- Sharp + - Adds the "Sharpness" Enchant, Can be stacked. Can not be used on throwables or slings. +- Silky + - Adds the "Silk Touch" Enchant. Can not be used on throwables or slings. Can't be used with Fortune. +- Smitey + - Adds the "Smite" Enchant, Can be stacked. Can only be used on Daggers, Swords or Cleavers. Max level 3. +- Soaked + - Gives the player "Water Breathing" effect while equiped. Can not be used with "Sponged" or "Bright". Can not be used on throwables or slings. Not stacked, it's an effect. +- Sponged + - Allows the player to absorb water within a 3x3 radius while equiped. Can not be used with "Soaked" or "Bright". +- Starstruck + - Has a 5% chance to drop a Netherstar when defeating hostile mobs. Can only be used on Daggers, Swords or Cleavers. +- Steal + - When a player attacks mobs they get the "Regeneration" effect. Can only be used on Daggers, Swords or Cleavers. +- Tough + - Gives the player "Resistance" effect while equiped. Max level 3. +- Ultimine + - Adds the ability to chop trees by breaking just one log, also adds the ability to break clusters of ores when mining. Can not be used with "Explosive". Can only be used on Pickaxes or Axes. + +--- + +You can combine a variety of Modifiers to create epic Tools and Weapons. + +Keep in mind that Modifiers are exclusive to Tinkers' Construct items. + +They won't work with Vanilla Minecraft items or items from other mods, and they can't be applied to Slings, Throwables, or Bows. + +![Modified Tools](../../_assets/images/tinkers-stacked-modifiers-example.png) +*An example of 3 Modifiers on a single tool. diff --git a/docs/marketplace/Addons/tinkers/Docs/Modifiers/worktable.md b/docs/marketplace/Addons/tinkers/Docs/Modifiers/worktable.md new file mode 100644 index 00000000..cd55a3d1 --- /dev/null +++ b/docs/marketplace/Addons/tinkers/Docs/Modifiers/worktable.md @@ -0,0 +1,42 @@ +--- +title: Modifier Worktable +--- + +Once you’ve crafted your Modifiers, you’ll need a Modifier Worktable to apply them to your weapons and tools. + +A Modifier Worktable can be crafted using Seared Bricks and any of these stone types: + +Andesite, Basalt, Cobblestone, Cobbled Deepslate, Diorite, Granite, Mossy Cobblestone, or Stone. + +![Modifier Worktable](../../_assets/images/tinkers-modifier-worktable.png) + + +## How to Use the Modifier Worktable + +![Using the Modifier Worktable](../../_assets/images/tinkers-modifier-worktable-screenshot.png) + +- Set up your Workbench: Place your Modifier Workbench wherever you'd like. +- Choose your Tool or Weapon: Select a Tinkers' Tool or Weapon (except Bows, Slings, and Throwables). +- Place your Item: Put the chosen item on the Workbench. +- Pick your Upgrade: Choose a Modifier to enhance your item. +- Supercharge your Gear: The Modifier will be added to your item. +- Grab your Gear: Take your modified item from the Workbench. + +### Removing modifiers + +![Modifier Remover](../../_assets/images/tinkers-remover-screenshot.png) + +Need to remove a Modifier or accidentally applied the wrong one? Don't worry, removing them is as simple as adding them. + +Place Your Tool: Position your tool on the Modifier Worktable. +Equip the Remover: Equip the Modifier Remover in your main hand. +Interact: Interact with the Modifier Remover. +Watch the Magic: The previously added modifiers will be removed, and the Modifier Remover will be consumed. + +#### Modifier Remover + +![Modifier Remover Item](../../_assets/images/tinkers-modifier-remover.png) + +Crafting Modifier Removers is easy: just place an empty Modifier into a Crafting Table. + +Remember, these are one-time use items, so use them wisely. diff --git a/docs/marketplace/Addons/tinkers/Docs/The Smeltery & Beyond/index.md b/docs/marketplace/Addons/tinkers/Docs/The Smeltery & Beyond/index.md index d63b0263..32058ad8 100644 --- a/docs/marketplace/Addons/tinkers/Docs/The Smeltery & Beyond/index.md +++ b/docs/marketplace/Addons/tinkers/Docs/The Smeltery & Beyond/index.md @@ -56,6 +56,7 @@ Smelteries need a steady supply of heat to melt metals. That's where tanks come *Tip: While tanks are great for fueling your smeltery, they're also versatile! You can use them to store water for other purposes.* + ### Seared Drain ![Seared Drain Recipe](../../_assets/images/tinkers-seared_Drain_recipe.png) @@ -162,4 +163,4 @@ Hold Sneak and punch the block you want to break. You'll receive a confirmation message to prevent accidental destruction. -*Remember, these are the main smeltery parts (Controller, Tank, Drain), so break with caution!* \ No newline at end of file +*Remember, these are the main smeltery parts (Controller, Tank, Drain), so break with caution!* diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/axe_head_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/axe_head_bronze.png new file mode 100644 index 00000000..9ae1d423 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/axe_head_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/cleaver_blade_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/cleaver_blade_bronze.png new file mode 100644 index 00000000..8cc7d162 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/cleaver_blade_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/dagger_blade_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/dagger_blade_bronze.png new file mode 100644 index 00000000..33d387ee Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/dagger_blade_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/pickaxe_head_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/pickaxe_head_bronze.png new file mode 100644 index 00000000..85f971f6 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/pickaxe_head_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/shoel_head_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/shoel_head_bronze.png new file mode 100644 index 00000000..f076edcc Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/shoel_head_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/parts/sword_blade_bronze.png b/docs/marketplace/Addons/tinkers/_assets/images/parts/sword_blade_bronze.png new file mode 100644 index 00000000..39f569b4 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/parts/sword_blade_bronze.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-cans_recipe.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-cans_recipe.png index 65bf82b2..13348d07 100644 Binary files a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-cans_recipe.png and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-cans_recipe.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-remover.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-remover.png new file mode 100644 index 00000000..54becf48 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-remover.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable-screenshot.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable-screenshot.png new file mode 100644 index 00000000..4fd1e485 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable-screenshot.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable.png new file mode 100644 index 00000000..6049824f Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifier-worktable.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-crafting-ui.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-crafting-ui.png new file mode 100644 index 00000000..6e8424a1 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-crafting-ui.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-template.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-template.png new file mode 100644 index 00000000..cfacb6b5 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-modifiers-template.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-remover-screenshot.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-remover-screenshot.png new file mode 100644 index 00000000..ab1e97b6 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-remover-screenshot.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-seared_faucet_recipe.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-seared_faucet_recipe.png new file mode 100644 index 00000000..352043c4 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-seared_faucet_recipe.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-stacked-modifiers-example.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-stacked-modifiers-example.png new file mode 100644 index 00000000..ee363958 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-stacked-modifiers-example.png differ diff --git a/docs/marketplace/Addons/tinkers/_assets/images/tinkers-tnt-modifier.png b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-tnt-modifier.png new file mode 100644 index 00000000..a1e41685 Binary files /dev/null and b/docs/marketplace/Addons/tinkers/_assets/images/tinkers-tnt-modifier.png differ diff --git a/src/components/Crafting/Crafting.tsx b/src/components/Crafting/Crafting.tsx index 99aa9fd6..5fa2f043 100644 --- a/src/components/Crafting/Crafting.tsx +++ b/src/components/Crafting/Crafting.tsx @@ -15,7 +15,7 @@ export function Crafting({recipeString}: Props) { return (
{recipe.type === 'table' && ( - +
)} {recipe.type === 'smelting' && ( diff --git a/src/components/Crafting/Table/Table.tsx b/src/components/Crafting/Table/Table.tsx index 2986afcc..9b81e93b 100644 --- a/src/components/Crafting/Table/Table.tsx +++ b/src/components/Crafting/Table/Table.tsx @@ -8,12 +8,13 @@ type Props = { ingredients: SlotItem[] output: SlotItem tags: Tags + customTableName?: string } -export default function Table({ingredients, output, tags}: Props) { +export default function Table({ingredients, output, tags, customTableName}: Props) { return (
-
Crafting Table
+
{customTableName == null ? "Crafting Table" : customTableName}
{[0, 1, 2].map(row => ( diff --git a/src/components/Crafting/util.ts b/src/components/Crafting/util.ts index f5d3ecf5..b63ab56c 100644 --- a/src/components/Crafting/util.ts +++ b/src/components/Crafting/util.ts @@ -3,6 +3,7 @@ export type Recipe = { ingredients: (SlotItem | null)[] output: SlotItem tags: Tags + customTableName?: string } export type SlotItem = { diff --git a/src/remark/crafting.ts b/src/remark/crafting.ts index c7823239..009ee6b2 100644 --- a/src/remark/crafting.ts +++ b/src/remark/crafting.ts @@ -8,9 +8,11 @@ const plugin = (options: any) => { const transform = async (tree: any) => { visit(tree, 'code', (node, index, parent) => { if (node.lang === 'crafting') { + const meta = node.meta.split(",") const [ingredients, output] = parseCrafting(node.value) const tags = loadTags(); - const type = node.meta || null; + const type = meta[0] || null; + const customTableName = meta[1] || null; parent.children[index] = { type: "mdxJsxFlowElement", name: "Crafting", @@ -23,6 +25,7 @@ const plugin = (options: any) => { output, type, tags: tags.tags, + customTableName }), }, ], diff --git a/static/img/mc/ftbtc/item/bone_bow.png b/static/img/mc/ftbtc/item/bone_bow.png new file mode 100644 index 00000000..d1168488 Binary files /dev/null and b/static/img/mc/ftbtc/item/bone_bow.png differ diff --git a/static/img/mc/ftbtc/item/large_handle_bone.png b/static/img/mc/ftbtc/item/large_handle_bone.png new file mode 100644 index 00000000..a548dd31 Binary files /dev/null and b/static/img/mc/ftbtc/item/large_handle_bone.png differ diff --git a/static/img/mc/ftbtc/item/pattern_repair_kit.png b/static/img/mc/ftbtc/item/pattern_repair_kit.png new file mode 100644 index 00000000..180aa334 Binary files /dev/null and b/static/img/mc/ftbtc/item/pattern_repair_kit.png differ diff --git a/static/img/mc/ftbtc/item/stone_repair_kit.png b/static/img/mc/ftbtc/item/stone_repair_kit.png new file mode 100644 index 00000000..7f26bd1c Binary files /dev/null and b/static/img/mc/ftbtc/item/stone_repair_kit.png differ diff --git a/static/img/mc/minecraft/string.png b/static/img/mc/minecraft/string.png new file mode 100644 index 00000000..c465cd8c Binary files /dev/null and b/static/img/mc/minecraft/string.png differ