Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

As well as added the smelter and working on the molder

11 files changed, 23 insertions, 0 deletions

diff --git a/resources/assets/jewelrycraft/Smelter.tcn b/resources/assets/jewelrycraft/Smelter.tcn
new file mode 100644
index 0000000..2f6597f
--- /dev/null
+++ b/resources/assets/jewelrycraft/Smelter.tcn
diff --git a/resources/assets/jewelrycraft/lang/en_US.lang b/resources/assets/jewelrycraft/lang/en_US.lang
new file mode 100644
index 0000000..ed9778b
--- /dev/null
+++ b/resources/assets/jewelrycraft/lang/en_US.lang
@@ -0,0 +1,7 @@
+item.jewelrycraft.thiefGloves.name=Thiefing Gloves
+item.jewelrycraft.ingotShadow.name=Shadow Ingot
+tile.jewelrycraft.oreShadow.name=Shadow Ore
+tile.jewelrycraft.smelter.name=Smelter
+tile.jewelrycraft.molder.name=Molder
+tile.jewelrycraft.jewelCraftingTable.name=Jewelers Crafting Table
+itemGroup.JewelryCraft.name=Jewelrycraft
diff --git a/resources/assets/jewelrycraft/pack.mcmeta b/resources/assets/jewelrycraft/pack.mcmeta
new file mode 100644
index 0000000..0b04ef8
--- /dev/null
+++ b/resources/assets/jewelrycraft/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 1,
+        "description": "Jewelrycraft"
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
new file mode 100644
index 0000000..31ee2a6
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
new file mode 100644
index 0000000..bf4c01e
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+	}
+}
\ No newline at end of file
diff --git a/resources/assets/jewelrycraft/textures/blocks/smelter.png b/resources/assets/jewelrycraft/textures/blocks/smelter.png
new file mode 100644
index 0000000..4da0c0a
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/smelter.png
diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
new file mode 100644
index 0000000..1522faf
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
new file mode 100644
index 0000000..09994da
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+	}
+}
\ No newline at end of file
diff --git a/resources/assets/jewelrycraft/textures/items/thiefGloves.png b/resources/assets/jewelrycraft/textures/items/thiefGloves.png
new file mode 100644
index 0000000..b56e925
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/items/thiefGloves.png
diff --git a/resources/assets/jewelrycraft/textures/tileentities/Molder.png b/resources/assets/jewelrycraft/textures/tileentities/Molder.png
new file mode 100644
index 0000000..c5acc88
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/tileentities/Molder.png
diff --git a/resources/assets/jewelrycraft/textures/tileentities/Smelter.png b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png
new file mode 100644
index 0000000..6ec3595
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png