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

As well as added the smelter and working on the molder

16 files changed, 8 insertions, 11 deletions

diff --git a/resources/BriefcaseSpeakers.png b/resources/BriefcaseSpeakers.png
deleted file mode 100644
index c808717..0000000
--- a/resources/BriefcaseSpeakers.png
+++ /dev/null
diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
deleted file mode 100644
index da4908f..0000000
--- a/resources/assets/briefcasespeakers/lang/en_US.lang
+++ /dev/null
@@ -1,10 +0,0 @@
-item.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers
-item.briefcasespeakers.remote.name=Audio Remote
-item.briefcasespeakers.speakers.name=Speakers
-item.briefcasespeakers.thiefGloves.name=Thiefing Gloves
-item.briefcasespeakers.ingotShadow.name=Shadow Ingot
-tile.briefcasespeakers.oreShadow.name=Shadow Ore
-tile.briefcasespeakers.smelter.name=Smelter
-tile.briefcasespeakers.molder.name=Molder
-tile.briefcasespeakers.jewelCraftingTable.name=Jewelers Crafting Table
-itemGroup.shadowspkrs=Jewelcraft/Randomcraft
diff --git a/resources/assets/briefcasespeakers/textures/items/speakers.png b/resources/assets/briefcasespeakers/textures/items/speakers.png
deleted file mode 100644
index bfe648d..0000000
--- a/resources/assets/briefcasespeakers/textures/items/speakers.png
+++ /dev/null
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/briefcasespeakers/pack.mcmeta b/resources/assets/jewelrycraft/pack.mcmeta
index 3aab978..0b04ef8 100644
--- a/resources/assets/briefcasespeakers/pack.mcmeta
+++ b/resources/assets/jewelrycraft/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "pack_format": 1,
-        "description": "BriefcaseSpeakers"
+        "description": "Jewelrycraft"
     }
 }
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
index 31ee2a6..31ee2a6 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
index bf4c01e..bf4c01e 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
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/briefcasespeakers/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
index 1522faf..1522faf 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
index 09994da..09994da 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
diff --git a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png b/resources/assets/jewelrycraft/textures/items/thiefGloves.png
index b56e925..b56e925 100644
--- a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png
+++ 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
diff --git a/resources/briefcase.png b/resources/briefcase.png
deleted file mode 100644
index c81f707..0000000
--- a/resources/briefcase.png
+++ /dev/null
diff --git a/resources/briefcasespeakers.tcn b/resources/briefcasespeakers.tcn
deleted file mode 100644
index 07967da..0000000
--- a/resources/briefcasespeakers.tcn
+++ /dev/null