Merge pull request #11 from bballboy2002/master

[1.12] Fix gaps between tracks
Railcraft · May 11, 2020 · 1b0be4d · 1b0be4d
2 parents a6db800 + 5c71d6d
commit 1b0be4d
Show file tree

Hide file tree

Showing 29 changed files with 298 additions and 298 deletions.
diff --git a/assets/minecraft/models/block/activator_rail_active_flat.json b/assets/minecraft/models/block/activator_rail_active_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -93,8 +93,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -136,8 +136,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 0, 13, 16], "texture": "#0"},

diff --git a/assets/minecraft/models/block/activator_rail_flat.json b/assets/minecraft/models/block/activator_rail_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -93,8 +93,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -136,8 +136,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 0, 13, 16], "texture": "#0"},

diff --git a/assets/minecraft/models/block/detector_rail_flat.json b/assets/minecraft/models/block/detector_rail_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -93,8 +93,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -136,8 +136,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 0, 13, 16], "texture": "#0"},

diff --git a/assets/minecraft/models/block/detector_rail_powered_flat.json b/assets/minecraft/models/block/detector_rail_powered_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [3, 15, 4, 16], "texture": "#0"},
@@ -69,8 +69,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -112,8 +112,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 15, 13, 16], "texture": "#0"},

diff --git a/assets/minecraft/models/block/golden_rail_active_flat.json b/assets/minecraft/models/block/golden_rail_active_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -93,8 +93,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -136,8 +136,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 0, 13, 16], "texture": "#0"},
@@ -353,8 +353,8 @@
 		},
 		{
 			"name": "Golden Left",
-			"from": [4, 1, 0],
-			"to": [5, 2, 16],
+			"from": [4, 1, -0.01],
+			"to": [5, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [4, 0, 5, 1], "texture": "#0"},
@@ -380,8 +380,8 @@
 		},
 		{
 			"name": "Golden Right",
-			"from": [11, 1, 0],
-			"to": [12, 2, 16],
+			"from": [11, 1, -0.01],
+			"to": [12, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [11, 0, 12, 1], "texture": "#0"},

diff --git a/assets/minecraft/models/block/golden_rail_flat.json b/assets/minecraft/models/block/golden_rail_flat.json
@@ -7,8 +7,8 @@
 	"elements": [
 		{
 			"name": "Outer Left",
-			"from": [2, 1, 0],
-			"to": [3, 2, 16],
+			"from": [2, 1, -0.01],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "Inner Left",
-			"from": [3, 1, 0],
-			"to": [4, 3, 16],
+			"from": [3, 1, -0.01],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -93,8 +93,8 @@
 		},
 		{
 			"name": "Outer Right",
-			"from": [13, 1, 0],
-			"to": [14, 2, 16],
+			"from": [13, 1, -0.01],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {
@@ -136,8 +136,8 @@
 		},
 		{
 			"name": "Inner Right",
-			"from": [12, 1, 0],
-			"to": [13, 3, 16],
+			"from": [12, 1, -0.01],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 0, 13, 16], "texture": "#0"},
@@ -353,8 +353,8 @@
 		},
 		{
 			"name": "Golden Left",
-			"from": [4, 1, 0],
-			"to": [5, 2, 16],
+			"from": [4, 1, -0.01],
+			"to": [5, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [4, 0, 5, 1], "texture": "#0"},
@@ -380,8 +380,8 @@
 		},
 		{
 			"name": "Golden Right",
-			"from": [11, 1, 0],
-			"to": [12, 2, 16],
+			"from": [11, 1, -0.01],
+			"to": [12, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [11, 0, 12, 1], "texture": "#0"},

diff --git a/assets/minecraft/models/block/rail_curved.json b/assets/minecraft/models/block/rail_curved.json
@@ -568,7 +568,7 @@
 		{
 			"name": "Inner Right 3",
 			"from": [14, 1, 12],
-			"to": [16, 3, 13],
+			"to": [16.01, 3, 13],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 14, 13, 16], "texture": "#rail"},
@@ -596,7 +596,7 @@
 		{
 			"name": "Inner Right 1",
 			"from": [12, 1, 14],
-			"to": [13, 3, 16],
+			"to": [13, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 14, 13, 16], "texture": "#rail"},
@@ -610,7 +610,7 @@
 		{
 			"name": "Inner Left 8",
 			"from": [12, 1, 3],
-			"to": [16, 3, 4],
+			"to": [16.01, 3, 4],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [3, 12, 4, 16], "texture": "#rail"},
@@ -708,7 +708,7 @@
 		{
 			"name": "Inner Left 1",
 			"from": [3, 1, 12],
-			"to": [4, 3, 16],
+			"to": [4, 3, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [3, 12, 4, 16], "texture": "#rail"},
@@ -722,7 +722,7 @@
 		{
 			"name": "Outer Left 9",
 			"from": [12, 1, 2],
-			"to": [16, 2, 3],
+			"to": [16.01, 2, 3],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 2, 16, 3], "texture": "#rail"},
@@ -834,7 +834,7 @@
 		{
 			"name": "Outer Left 1",
 			"from": [2, 1, 12],
-			"to": [3, 2, 16],
+			"to": [3, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 2, 16, 3], "texture": "#rail"},
@@ -848,7 +848,7 @@
 		{
 			"name": "Outer Right 1",
 			"from": [13, 1, 14],
-			"to": [14, 2, 16],
+			"to": [14, 2, 16.01],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 2, 16, 3], "texture": "#rail"},
@@ -862,7 +862,7 @@
 		{
 			"name": "Outer Right 2",
 			"from": [14, 1, 13],
-			"to": [16, 2, 14],
+			"to": [16.01, 2, 14],
 			"shade": true,
 			"faces": {
 				"north": {"uv": [12, 2, 14, 3], "texture": "#rail"},