diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-15 16:52:41 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-15 16:52:41 +0200 |
| commit | 06415dc21d71e8ac363dae5c56c5317971f7aede (patch) | |
| tree | 7ddbe2cc709a5a39c3fe8b8a80d7ac77f336a220 /resources/assets/briefcasespeakers | |
| parent | 9342967bd8a6a9451591325c7c5deb5416819adc (diff) | |
| parent | 943f1a493b27c630e95730b385e6524643d98564 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
As well as added the smelter and working on the molder
Diffstat (limited to 'resources/assets/briefcasespeakers')
| -rw-r--r-- | resources/assets/briefcasespeakers/lang/en_US.lang | 10 | ||||
| -rw-r--r-- | resources/assets/briefcasespeakers/pack.mcmeta | 6 | ||||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/blocks/oreShadow.png | bin | 1882 -> 0 bytes | |||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta | 5 | ||||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/ingotShadow.png | bin | 552 -> 0 bytes | |||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta | 5 | ||||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/speakers.png | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/thiefGloves.png | bin | 290 -> 0 bytes |
8 files changed, 0 insertions, 26 deletions
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/pack.mcmeta b/resources/assets/briefcasespeakers/pack.mcmeta deleted file mode 100644 index 3aab978..0000000 --- a/resources/assets/briefcasespeakers/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 1, - "description": "BriefcaseSpeakers" - } -}
\ No newline at end of file diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png Binary files differdeleted file mode 100644 index 31ee2a6..0000000 --- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png +++ /dev/null diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta deleted file mode 100644 index bf4c01e..0000000 --- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -}
\ No newline at end of file diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png Binary files differdeleted file mode 100644 index 1522faf..0000000 --- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png +++ /dev/null diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta deleted file mode 100644 index 09994da..0000000 --- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 4 - } -}
\ No newline at end of file diff --git a/resources/assets/briefcasespeakers/textures/items/speakers.png b/resources/assets/briefcasespeakers/textures/items/speakers.png Binary files differdeleted file mode 100644 index bfe648d..0000000 --- a/resources/assets/briefcasespeakers/textures/items/speakers.png +++ /dev/null diff --git a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png b/resources/assets/briefcasespeakers/textures/items/thiefGloves.png Binary files differdeleted file mode 100644 index b56e925..0000000 --- a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png +++ /dev/null |
