Merge pull request #266 from CannoliCatfish/dev

Hotfix 1

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

@@ -2820,6 +2820,8 @@
   "death.attack.columns.player": "%1$s was squished by a falling column whilst trying to escape %2$s",
   "death.attack.suffocating": "%1$s suffocated in a gas cloud",
   "death.attack.suffocating.player": "%1$s suffocated in a gas cloud whilst trying to escape %2$s",
+  "effect.rankine.conductive": "Conductive",
+  "effect.rankine.mercury_poison": "Mercury Poisoning",
   "element.rankine:elements/copper.desc0": "Copper is a transition metal with an atomic number of 29.",
   "element.rankine:elements/copper.desc1": "Commonly used in electrical components and early alloys.",
   "element.rankine:elements/copper.desc2": "Commonly used in electrical components and early alloys.",
@@ -2953,6 +2955,12 @@
   "fluid.rankine.sap": "Sap",
   "fluid.rankine.sulfuric_acid": "Sulfuric Acid",
   "fluid.rankine.white_liquor": "White Liquor",
+  "item.minecraft.lingering_potion.effect.conductive": "Lingering Potion of Conductivity",
+  "item.minecraft.lingering_potion.effect.mercury_poison": "Lingering Potion of Mercury Poisoning",
+  "item.minecraft.potion.effect.conductive": "Potion of Conductivity",
+  "item.minecraft.potion.effect.mercury_poison": "Potion of Mercury Poisoning",
+  "item.minecraft.splash_potion.effect.conductive": "Splash Potion of Conductivity",
+  "item.minecraft.splash_potion.effect.mercury_poison": "Splash Potion of Mercury Poisoning",
   "item.rankine.acanthite": "Acanthite",
   "item.rankine.acanthite.tooltip0": "Ag2S",
   "item.rankine.acanthite.tooltip1": "Used as a source of silver.",
@@ -4557,7 +4565,7 @@
   "rankine.journal.cat_tools.standard_tools.text9": "A familiar tool used to break wooden blocks. Additional items can be obtained from stripping logs. $(br2)Alloy axes have the bonus capability of chopping down entire trees.",
   "rankine.journal.cat_tools.totems.name": "Totems",
   "rankine.journal.cat_tools.totems.text1": "Totems are relics derived from the natural magics of the world. While in the offhand, they provide various effects.",
-  "rankine.journal.cat_tools.totems.totem_of_blazing": "",
+  "rankine.journal.cat_tools.totems.totem_of_blazing": "When on fire, deal 1.5x damage and lay fire at your feet. When health is less than 25% or you fall in lava, this totem disappears and provides Fire Resistance and a small amount of Regeneration.",
   "rankine.journal.cat_tools.totems.totem_of_cobbling": "Internally stores all types of stones up to 8 stacks. Can be used to place cobblestone.",
   "rankine.journal.cat_tools.totems.totem_of_enduring": "Increases the wearer's health capacity. Can be used every so often to apply regeneration.",
   "rankine.journal.cat_tools.totems.totem_of_hastening": "Applies efficiency to your arms, allowing you to mine all blocks quicker.",

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__axe.json → src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_axe.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "rankine:amalgam__axe"
+      "rankine:amalgam_axe"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "rankine:amalgam__axe"
+        "recipe": "rankine:amalgam_axe"
       }
     }
   },

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_blunderbuss.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "rankine:amalgam_blunderbuss"
+    ]
+  },
+  "criteria": {
+    "has_alloy": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "rankine:amalgam_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "rankine:amalgam_blunderbuss"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_alloy",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hammer.json → src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_crowbar.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "rankine:amalgam__hammer"
+      "rankine:amalgam_crowbar"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "rankine:amalgam__hammer"
+        "recipe": "rankine:amalgam_crowbar"
       }
     }
   },

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__knife.json → src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hammer.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "rankine:amalgam__knife"
+      "rankine:amalgam_hammer"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "rankine:amalgam__knife"
+        "recipe": "rankine:amalgam_hammer"
       }
     }
   },

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hoe.json → src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hoe.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "rankine:amalgam__hoe"
+      "rankine:amalgam_hoe"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "rankine:amalgam__hoe"
+        "recipe": "rankine:amalgam_hoe"
       }
     }
   },

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__spear.json → src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_knife.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "rankine:amalgam__spear"
+      "rankine:amalgam_knife"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "rankine:amalgam__spear"
+        "recipe": "rankine:amalgam_knife"
       }
     }
   },

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_pickaxe.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "rankine:amalgam_pickaxe"
+    ]
+  },
+  "criteria": {
+    "has_alloy": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "rankine:amalgam_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "rankine:amalgam_pickaxe"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_alloy",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_shovel.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "rankine:amalgam_shovel"
+    ]
+  },
+  "criteria": {
+    "has_alloy": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "rankine:amalgam_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "rankine:amalgam_shovel"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_alloy",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_spear.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "rankine:amalgam_spear"
+    ]
+  },
+  "criteria": {
+    "has_alloy": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "rankine:amalgam_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "rankine:amalgam_spear"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_alloy",
+      "has_the_recipe"
+    ]
+  ]
+}