From 95f1e768fe6ee1a3ae8a487480dbe10ed0bfa73f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 20:40:11 -0500 Subject: [PATCH] Update forge, fix mana blaster overrides --- build.properties | 2 +- .../java/vazkii/botania/common/lib/LibMisc.java | 2 +- .../assets/botania/models/item/manaGun.json | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 837a2eb82..6be06eaa1 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.1960 +forge_version=12.17.0.1965 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 07b446601..58e2ed205 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.1960,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1965,];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/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 678d3ca53..5e6ef87b7 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -186,6 +186,13 @@ } }, "overrides": [ + { + "predicate": { + "botania:desu": 1, + "botania:clip": 1 + }, + "model": "botania:item/desuGunClip" + }, { "predicate": { "botania:clip": 1 @@ -197,13 +204,6 @@ "botania:desu": 1 }, "model": "botania:item/desuGun" - }, - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" } ] } \ No newline at end of file