summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-05-03 00:14:45 +0200
committerRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-05-03 00:14:45 +0200
commit619717b89e1565ec090549296ada545b92fdae09 (patch)
treec584052c0c3de8228ff24ce6101c1a498dcd63a2 /src/main/resources
parentd1793808c48d9d747dc1e04169b70a77fb4975f6 (diff)
- Added Textures of all 16 ingot types
- Tweaked ore hardness - Inititalized lignit as furnace burning material
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/zcompression/lang/de_DE.lang2
-rw-r--r--src/main/resources/assets/zcompression/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/zcompression/models/item/lignite.json (renamed from src/main/resources/assets/zcompression/models/item/slagiron.json)2
-rw-r--r--src/main/resources/assets/zcompression/models/item/slagiron_ingot.json6
-rw-r--r--src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png (renamed from src/main/resources/assets/zcompression/textures/items/slagiron.png)bin15409 -> 15409 bytes
5 files changed, 11 insertions, 1 deletions
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/slagiron.json b/src/main/resources/assets/zcompression/models/item/lignite.json
index 84b9cd1..4fbbd9c 100644
--- a/src/main/resources/assets/zcompression/models/item/slagiron.json
+++ b/src/main/resources/assets/zcompression/models/item/lignite.json
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
- "layer0": "zcompression:items/slagiron"
+ "layer0": "zcompression:items/lignite"
}
} \ 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_ingot.png
index 2b70a7e..2b70a7e 100644
--- a/src/main/resources/assets/zcompression/textures/items/slagiron.png
+++ b/src/main/resources/assets/zcompression/textures/items/slagiron_ingot.png
Binary files differ