summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-05-13 20:43:51 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-05-13 20:43:51 +0200
commitc1ba3a19f44b512f060b966f6bc1025a9b7c928f (patch)
treeeb61b56b22b669858c1cf6790d3eba0ef9867a74 /src/main/resources
parente80a236cf5087c189df93a0b4b73967cfcc06741 (diff)
FluidTest
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json7
-rw-r--r--src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json7
-rw-r--r--src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json6
-rw-r--r--src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json6
-rw-r--r--src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json (renamed from src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json)2
-rw-r--r--src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png (renamed from src/main/resources/assets/ztic_addon/textures/blocks/instable_polynium_block.png)bin16060 -> 16060 bytes
-rw-r--r--src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png (renamed from src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png)bin16264 -> 16264 bytes
7 files changed, 14 insertions, 14 deletions
diff --git a/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json
new file mode 100644
index 0000000..9370d6b
--- /dev/null
+++ b/src/main/resources/assets/ztic_addon/blockstates/instablePolynium_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "normal": {
+ "model": "ztic_addon:instablePolynium_block"
+ }
+ }
+}
diff --git a/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json
deleted file mode 100644
index 8908a1b..0000000
--- a/src/main/resources/assets/ztic_addon/blockstates/instable_polynium_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "variants": {
- "normal": {
- "model": "ztic_addon:instable_polynium_block"
- }
- }
-}
diff --git a/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json b/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json
new file mode 100644
index 0000000..b5b01e5
--- /dev/null
+++ b/src/main/resources/assets/ztic_addon/models/block/instablePolynium_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "block/cube_all",
+ "textures": {
+ "all": "ztic_addon:blocks/instablePolynium_block"
+ }
+}
diff --git a/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json
deleted file mode 100644
index a488ca6..0000000
--- a/src/main/resources/assets/ztic_addon/models/block/instable_polynium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "parent": "block/cube_all",
- "textures": {
- "all": "ztic_addon:blocks/instable_polynium_block"
- }
-}
diff --git a/src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json b/src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json
index ec6389c..c6d8532 100644
--- a/src/main/resources/assets/ztic_addon/models/item/instable_polynium_block.json
+++ b/src/main/resources/assets/ztic_addon/models/item/instablePolynium_block.json
@@ -1,5 +1,5 @@
{
- "parent": "ztic_addon:block/instable_polynium_block",
+ "parent": "ztic_addon:block/instablePolynium_block",
"display": {
"thirdperson": {
"rotation": [
diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/instable_polynium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png
index 92819b5..92819b5 100644
--- a/src/main/resources/assets/ztic_addon/textures/blocks/instable_polynium_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/instablePolynium_block.png
Binary files differ
diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png
index 139630f..139630f 100644
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/instable_polynium_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/instablePolynium_ingot.png
Binary files differ