Merge branch 'pr/30'

.gitattributes

@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain

src/assets/warpdrive/textures/blocks/airgenSideActive.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/cloakCoilSideActive.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/assets/warpdrive/textures/blocks/cloakingCoreActive.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive1.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive2.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive3.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive4.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive5.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/contSideActive6.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}

src/assets/warpdrive/textures/blocks/coreSideActive.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/liftUpDown.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/liftUpIn.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/liftUpOut.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide0.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide1.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide10.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide2.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide3.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide4.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide5.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide6.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide7.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide8.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}

src/assets/warpdrive/textures/blocks/particleBoosterSide9.png.mcmeta

@@ -0,0 +1,4 @@
+{
+  "animation": {
+  }
+}