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

Conflicts:
	resources/assets/briefcasespeakers/lang/en_US.lang

5 files changed, 12 insertions, 1 deletions

diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
index d4979a3..4b58514 100644
--- a/resources/assets/briefcasespeakers/lang/en_US.lang
+++ b/resources/assets/briefcasespeakers/lang/en_US.lang
@@ -2,4 +2,5 @@ block.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers
 item.briefcasespeakers.remote.name=Audio Remote
 item.briefcasespeakers.speaker.name=Speaker
 item.briefcasespeakers.thiefGloves.name=Thiefing Gloves
-item.briefcasespeakers.ingotShadow.name=Shadow Ingot
\ No newline at end of file
+item.briefcasespeakers.ingotShadow.name=Shadow Ingot
+block.briefcasespeakers.oreShadow=Shadow Ore
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png
new file mode 100644
index 0000000..f248291
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png
diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta
new file mode 100644
index 0000000..09994da
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+	}
+}
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
index 1736496..1522faf 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
+++ b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
diff --git a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta
new file mode 100644
index 0000000..09994da
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+	}
+}
\ No newline at end of file