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

Conflicts:
	common/bspkrs/briefcasespeakers/config/ConfigHandler.java
	common/bspkrs/briefcasespeakers/item/ItemList.java

6 files changed, 12 insertions, 0 deletions

diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
new file mode 100644
index 0000000..954ce22
--- /dev/null
+++ b/resources/assets/briefcasespeakers/lang/en_US.lang
@@ -0,0 +1,6 @@
+item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers
+item.briefcasespeakers.remote=Audio Remote
+item.briefcasespeakers.speaker=Speaker
+item.briefcasespeakers.thiefGloves=Thiefing Gloves
+item.briefcasespeakers.ingotShadow=Shadow Ingot
+block.briefcasespeakers.oreShadow=Shadow Ore
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/pack.mcmeta b/resources/assets/briefcasespeakers/pack.mcmeta
new file mode 100644
index 0000000..3aab978
--- /dev/null
+++ b/resources/assets/briefcasespeakers/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 1,
+        "description": "BriefcaseSpeakers"
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png
diff --git a/resources/assets/briefcasespeakers/textures/items/remote.png b/resources/assets/briefcasespeakers/textures/items/remote.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/remote.png
diff --git a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png
new file mode 100644
index 0000000..1522faf
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png
diff --git a/resources/assets/briefcasespeakers/textures/items/speaker.png b/resources/assets/briefcasespeakers/textures/items/speaker.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/speaker.png