Line endings

2016-01-17 15:47:13 +01:00 · 2016-01-17 15:47:13 +01:00 · 161b9065ea
parent 9ae744188b
commit 161b9065ea
46 changed files with 811 additions and 810 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -5,6 +5,7 @@
 *.mcmeta text
 *.md    text
 *.txt   text
+*.json  text
 *.properties text

 *.png   -text
--- a/src/main/resources/assets/openblocks/models/item/wrench.json
+++ b/src/main/resources/assets/openblocks/models/item/wrench.json
@ -5,9 +5,9 @@
    },
    "display" : {
        "thirdperson" : {
-            "rotation" : [ -90, 0, 0 ],
-            "translation" : [ 0, 1, -3 ],
-            "scale" : [ 0.55, 0.55, 0.55 ]
+            "rotation": [ 0, 90, -35 ],
+            "translation": [ 0, 1.25, -3.5 ],
+            "scale": [ 1.25, 1.25, 1.25 ]
        },
        "firstperson" : {
            "rotation" : [ 0, -135, 25 ],