diff --git a/build.properties b/build.properties index 580ed074c..837a2eb82 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1948 +forge_version=12.17.0.1960 mc_version=1.9.4 dir_repo=./ build_number=309 diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 283ac2679..07b446601 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1948,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1960,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json index 4b99230ed..f118d25f3 100644 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -2,7 +2,50 @@ "forge_marker": 1, "defaults": { "model": "botania:pylon.obj", - "transform": "forge:default-block", + "transform": { + "gui": { + "rotation": [ {"x": 30}, {"y": 225}, {"z": 0} ], + "translation": [ -0.25, 0, 0], + "scale": 0.5625, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "ground": { + "rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ], + "translation": [ 0, 0.1875, 0], + "scale": 0.25, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "fixed": { + "rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ], + "translation": [ 0, -0.15625, 0.3125 ], + "scale": 0.5, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "thirdperson_righthand": { + "rotation": [ {"x": 75}, {"y": 45}, {"z": 0} ], + "translation": [ 0.125, -0.125, 0 ], + "scale": 0.375, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "thirdperson_lefthand": { + "rotation": [ {"x": 75}, {"y": 225}, {"z": 0} ], + "translation": [ -0.375, 0.375, -0.125 ], + "scale": 0.375, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "firstperson_righthand": { + "rotation": [ {"x": 0}, {"y": 45}, {"z": 0} ], + "translation": [ 0.375, 0, 0.25 ], + "scale": 0.4, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "firstperson_lefthand": { + "rotation": [ {"x": 0}, {"y": 225}, {"z": 0} ], + "translation": [ -0.375, 0, -0.25 ], + "scale": 0.4, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + } + }, "custom": { "flip-v": true }