diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 23:03:36 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 23:03:36 +0200 |
| commit | 6179c30aa5a053adce80dce2658495af3b142ff1 (patch) | |
| tree | 0e6c2f3dd6a20cdab968c6a2d9e6993676297a64 /resources/assets/briefcasespeakers/textures | |
| parent | 82f70a31ea3845242f464e53d7844c8260d1ff1f (diff) | |
| parent | 0e733050e5822b569e9b4834c7f2224dbe688659 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
Conflicts:
resources/assets/briefcasespeakers/lang/en_US.lang
Diffstat (limited to 'resources/assets/briefcasespeakers/textures')
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/blocks/oreShadow.png (renamed from resources/assets/briefcasespeakers/textures/blocks/shadowOre.png) | bin | 2582 -> 2582 bytes | |||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta (renamed from resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta) | 0 | ||||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/ingotShadow.png (renamed from resources/assets/briefcasespeakers/textures/items/shadowIngot.png) | bin | 552 -> 552 bytes | |||
| -rw-r--r-- | resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta (renamed from resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png Binary files differindex f248291..f248291 100644 --- a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png +++ b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta index 09994da..09994da 100644 --- a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta +++ b/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta diff --git a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png Binary files differindex 1522faf..1522faf 100644 --- a/resources/assets/briefcasespeakers/textures/items/shadowIngot.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/ingotShadow.png.mcmeta index 09994da..09994da 100644 --- a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta +++ b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta |
