summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-05-02 11:13:34 +0200
committerRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-05-02 11:13:34 +0200
commit72b27f87c7ca5f93aafc681c35d462862e350783 (patch)
tree8282609a67cd62d807ae3dc082feacff936dc640 /src/main/resources
parent2533654bb98ae5b352498711d0439e423c70f7a1 (diff)
Again some stuff... still learning git ;)
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/zcompression/blockstates/aardium_ore.json5
-rw-r--r--src/main/resources/assets/zcompression/blockstates/axiidian_ore.json5
-rw-r--r--src/main/resources/assets/zcompression/blockstates/ignitite_ore.json5
-rw-r--r--src/main/resources/assets/zcompression/blockstates/karmesine_ore.json2
-rw-r--r--src/main/resources/assets/zcompression/blockstates/slaggold_ore.json5
-rw-r--r--src/main/resources/assets/zcompression/blockstates/yrdean_ore.json5
-rw-r--r--src/main/resources/assets/zcompression/lang/de_DE.lang6
-rw-r--r--src/main/resources/assets/zcompression/lang/en_US.lang7
-rw-r--r--src/main/resources/assets/zcompression/models/block/aardium_ore.json6
-rw-r--r--src/main/resources/assets/zcompression/models/block/axiidian_ore.json6
-rw-r--r--src/main/resources/assets/zcompression/models/block/ignitite_ore.json6
-rw-r--r--src/main/resources/assets/zcompression/models/block/slaggold_ore.json6
-rw-r--r--src/main/resources/assets/zcompression/models/block/yrdean_ore.json6
-rw-r--r--src/main/resources/assets/zcompression/models/item/aardium_ore.json10
-rw-r--r--src/main/resources/assets/zcompression/models/item/axiidian_ore.json10
-rw-r--r--src/main/resources/assets/zcompression/models/item/ignitite_ore.json10
-rw-r--r--src/main/resources/assets/zcompression/models/item/slaggold_ore.json10
-rw-r--r--src/main/resources/assets/zcompression/models/item/yrdean_ore.json10
-rw-r--r--src/main/resources/assets/zcompression/textures/blocks/aardium_ore.pngbin0 -> 16194 bytes
-rw-r--r--src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.pngbin0 -> 15997 bytes
-rw-r--r--src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.pngbin0 -> 16033 bytes
-rw-r--r--src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.pngbin0 -> 15870 bytes
-rw-r--r--src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.pngbin0 -> 16019 bytes
23 files changed, 117 insertions, 3 deletions
diff --git a/src/main/resources/assets/zcompression/blockstates/aardium_ore.json b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json
new file mode 100644
index 0000000..f690c3d
--- /dev/null
+++ b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "zcompression:aardium_ore" }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json
new file mode 100644
index 0000000..a64bee9
--- /dev/null
+++ b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "zcompression:axiidian_ore" }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json
new file mode 100644
index 0000000..aaa1f08
--- /dev/null
+++ b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "zcompression:ignitite_ore" }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json
index 548dbdb..0c524c7 100644
--- a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json
+++ b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json
@@ -1,5 +1,5 @@
{
"variants": {
- "normal": { "model": "zcompression:karmesite_ore" }
+ "normal": { "model": "zcompression:karmesine_ore" }
}
} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json
new file mode 100644
index 0000000..ad53974
--- /dev/null
+++ b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "zcompression:slaggold_ore" }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json
new file mode 100644
index 0000000..b51e4d5
--- /dev/null
+++ b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "zcompression:yrdean_ore" }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/lang/de_DE.lang b/src/main/resources/assets/zcompression/lang/de_DE.lang
index 354be92..6b1d736 100644
--- a/src/main/resources/assets/zcompression/lang/de_DE.lang
+++ b/src/main/resources/assets/zcompression/lang/de_DE.lang
@@ -13,6 +13,10 @@ tile.palladium_ore.name=Palladiumerz
tile.prometheum_ore.name=Prometheumerz
tile.rotten_ground.name=Verrottete Erde
tile.slagiron_ore.name=Unreines Eisenerz
+tile.slaggold_ore.name=Unreines Golderz
tile.tiberium_ore.name=Tiberiumerz
tile.vibranium_ore.name=Vibraniumerz
-
+tile.yrdean_ore.name=Yrdeanerz
+tile.aardium_ore.name=Aardiumerz
+tile.ignitite_ore.name=Ignititerz
+tile.axiidian_ore.name=Axiidianerz
diff --git a/src/main/resources/assets/zcompression/lang/en_US.lang b/src/main/resources/assets/zcompression/lang/en_US.lang
index cbf40a3..3ed16e9 100644
--- a/src/main/resources/assets/zcompression/lang/en_US.lang
+++ b/src/main/resources/assets/zcompression/lang/en_US.lang
@@ -13,5 +13,10 @@ tile.palladium_ore.name=Palladium Ore
tile.prometheum_ore.name=Prometheum Ore
tile.rotten_ground.name=Rotten Ground
tile.slagiron_ore.name=Slagiron Ore
+tile.slaggold_ore.name=Slaggold Ore
tile.tiberium_ore.name=Tiberium Ore
-tile.vibranium_ore.name=Vibranium Ore \ No newline at end of file
+tile.vibranium_ore.name=Vibranium Ore
+tile.yrdean_ore.name=Yrdean Ore
+tile.aardium_ore.name=Aardium Ore
+tile.ignitite_ore.name=Ignitite Ore
+tile.axiidian_ore.name=Axiidian Ore \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/block/aardium_ore.json b/src/main/resources/assets/zcompression/models/block/aardium_ore.json
new file mode 100644
index 0000000..02751a3
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/block/aardium_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "zcompression:blocks/aardium_ore"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/block/axiidian_ore.json b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json
new file mode 100644
index 0000000..791ea7d
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "zcompression:blocks/axiidian_ore"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/block/ignitite_ore.json b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json
new file mode 100644
index 0000000..7aeae76
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "zcompression:blocks/ignitite_ore"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/block/slaggold_ore.json b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json
new file mode 100644
index 0000000..d0ad960
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "zcompression:blocks/slaggold_ore"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/block/yrdean_ore.json b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json
new file mode 100644
index 0000000..f56f793
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "zcompression:blocks/yrdean_ore"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/item/aardium_ore.json b/src/main/resources/assets/zcompression/models/item/aardium_ore.json
new file mode 100644
index 0000000..85071c3
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/item/aardium_ore.json
@@ -0,0 +1,10 @@
+{
+ "parent": "zcompression:block/aardium_ore",
+ "display": {
+ "thirdperson": {
+ "rotation": [ 10, -45, 170 ],
+ "translation": [ 0, 1.5, -2.75 ],
+ "scale": [ 0.375, 0.375, 0.375 ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/item/axiidian_ore.json b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json
new file mode 100644
index 0000000..ad1df08
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json
@@ -0,0 +1,10 @@
+{
+ "parent": "zcompression:block/axiidian_ore",
+ "display": {
+ "thirdperson": {
+ "rotation": [ 10, -45, 170 ],
+ "translation": [ 0, 1.5, -2.75 ],
+ "scale": [ 0.375, 0.375, 0.375 ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/item/ignitite_ore.json b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json
new file mode 100644
index 0000000..e165f48
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json
@@ -0,0 +1,10 @@
+{
+ "parent": "zcompression:block/ignitite_ore",
+ "display": {
+ "thirdperson": {
+ "rotation": [ 10, -45, 170 ],
+ "translation": [ 0, 1.5, -2.75 ],
+ "scale": [ 0.375, 0.375, 0.375 ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/item/slaggold_ore.json b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json
new file mode 100644
index 0000000..7fdfe68
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json
@@ -0,0 +1,10 @@
+{
+ "parent": "zcompression:block/slaggold_ore",
+ "display": {
+ "thirdperson": {
+ "rotation": [ 10, -45, 170 ],
+ "translation": [ 0, 1.5, -2.75 ],
+ "scale": [ 0.375, 0.375, 0.375 ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/models/item/yrdean_ore.json b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json
new file mode 100644
index 0000000..24d64eb
--- /dev/null
+++ b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json
@@ -0,0 +1,10 @@
+{
+ "parent": "zcompression:block/yrdean_ore",
+ "display": {
+ "thirdperson": {
+ "rotation": [ 10, -45, 170 ],
+ "translation": [ 0, 1.5, -2.75 ],
+ "scale": [ 0.375, 0.375, 0.375 ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png b/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png
new file mode 100644
index 0000000..a84a712
--- /dev/null
+++ b/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png
Binary files differ
diff --git a/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png b/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png
new file mode 100644
index 0000000..cb0b06d
--- /dev/null
+++ b/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png
Binary files differ
diff --git a/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png b/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png
new file mode 100644
index 0000000..52340ce
--- /dev/null
+++ b/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png
Binary files differ
diff --git a/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png b/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png
new file mode 100644
index 0000000..eb64dd7
--- /dev/null
+++ b/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png
Binary files differ
diff --git a/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png b/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png
new file mode 100644
index 0000000..2a422ed
--- /dev/null
+++ b/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png
Binary files differ