Commit 10e985a6 authored by primetoxinz's avatar primetoxinz

Update forge. Override item models for #4898. Waiting for CTM update to fix bad bug.

parent ff8debc6
......@@ -26,7 +26,7 @@ if (System.getenv().BUILD_NUMBER != null) {//adds the build number to the end of
}
minecraft {
version = "1.12.2-14.23.4.2705"
version = "1.12.2-14.23.4.2725"
runDir = "run"
mappings = "snapshot_20171125"
replace "%VERSION%": "${project.version}"
......@@ -45,7 +45,7 @@ repositories {
dependencies {
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "applecore:AppleCore:1.12.2-3.1.0:deobf"
deobfCompile "team.chisel.ctm:CTM:MC1.12-0.3.0.15"
deobfCompile "team.chisel.ctm:CTM:MC1.12+"
deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2:deobf"
compile "MCMultiPart2:MCMultiPart:2.4.1"
runtime "MCMultiPart2:MCMultiPart:2.4.1"
......
......@@ -2,7 +2,6 @@ package betterwithmods.common.blocks;
import betterwithmods.common.entity.EntityMiningCharge;
import betterwithmods.util.DirUtils;
import jline.internal.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockTNT;
import net.minecraft.block.SoundType;
......@@ -22,6 +21,8 @@ import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
/**
* Created by primetoxinz on 9/5/16.
*/
......
......@@ -13,7 +13,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"stage": {
......
......@@ -14,7 +14,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"shape": {
......
......@@ -14,7 +14,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"shape": {
......
......@@ -14,7 +14,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"shape": {
......
......@@ -12,7 +12,9 @@
{}
],
"inventory": [
{}
{
"model": "betterwithmods:items/rope"
}
]
}
}
\ No newline at end of file
......@@ -14,7 +14,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"connection": {
......
......@@ -17,7 +17,8 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"facing": {
......
......@@ -16,7 +16,9 @@
],
"inventory": [
{
"transform": "forge:default-block"
"transform": "forge:default-block",
"model": "betterwithmods:item/default"
}
],
"axis": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment