From 619717b89e1565ec090549296ada545b92fdae09 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Tue, 3 May 2016 00:14:45 +0200 Subject: - Added Textures of all 16 ingot types - Tweaked ore hardness - Inititalized lignit as furnace burning material --- src/main/resources/assets/zcompression/lang/de_DE.lang | 2 ++ src/main/resources/assets/zcompression/lang/en_US.lang | 2 ++ .../assets/zcompression/models/item/lignite.json | 6 ++++++ .../assets/zcompression/models/item/slagiron.json | 6 ------ .../assets/zcompression/models/item/slagiron_ingot.json | 6 ++++++ .../assets/zcompression/textures/items/slagiron.png | Bin 15409 -> 0 bytes .../zcompression/textures/items/slagiron_ingot.png | Bin 0 -> 15409 bytes 7 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/zcompression/models/item/lignite.json delete mode 100644 src/main/resources/assets/zcompression/models/item/slagiron.json create mode 100644 src/main/resources/assets/zcompression/models/item/slagiron_ingot.json delete mode 100644 src/main/resources/assets/zcompression/textures/items/slagiron.png create mode 100644 src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/zcompression/lang/de_DE.lang b/src/main/resources/assets/zcompression/lang/de_DE.lang index 6b1d736..a1dbe1f 100644 --- a/src/main/resources/assets/zcompression/lang/de_DE.lang +++ b/src/main/resources/assets/zcompression/lang/de_DE.lang @@ -1,4 +1,6 @@ item.slagiron.name=Unreiner Eisenbarren +item.lignite.name=Braunkohle + tile.adamantite_ore.name=Adamantiterz tile.arcanite_ore.name=Arcaniterz tile.basalt.name=Basalt diff --git a/src/main/resources/assets/zcompression/lang/en_US.lang b/src/main/resources/assets/zcompression/lang/en_US.lang index 3ed16e9..e4703c5 100644 --- a/src/main/resources/assets/zcompression/lang/en_US.lang +++ b/src/main/resources/assets/zcompression/lang/en_US.lang @@ -1,4 +1,6 @@ item.slagiron.name=Slagiron Bar +item.lignite.name=Lignite + tile.adamantite_ore.name=Adamantite Ore tile.arcanite_ore.name=Arcanite Ore tile.basalt.name=Basalt diff --git a/src/main/resources/assets/zcompression/models/item/lignite.json b/src/main/resources/assets/zcompression/models/item/lignite.json new file mode 100644 index 0000000..4fbbd9c --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/lignite.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/lignite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/slagiron.json b/src/main/resources/assets/zcompression/models/item/slagiron.json deleted file mode 100644 index 84b9cd1..0000000 --- a/src/main/resources/assets/zcompression/models/item/slagiron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "zcompression:items/slagiron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/slagiron_ingot.json b/src/main/resources/assets/zcompression/models/item/slagiron_ingot.json new file mode 100644 index 0000000..eeff9a9 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/slagiron_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/slagiron_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/textures/items/slagiron.png b/src/main/resources/assets/zcompression/textures/items/slagiron.png deleted file mode 100644 index 2b70a7e..0000000 Binary files a/src/main/resources/assets/zcompression/textures/items/slagiron.png and /dev/null differ diff --git a/src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png b/src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png new file mode 100644 index 0000000..2b70a7e Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png differ -- cgit v1.2.3