Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some model fixes #112

Open
wants to merge 2 commits into
base: 1.12.2
Choose a base branch
from
Open

Some model fixes #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e503ded
fix some (but not all) model loading errors
temp1011 May 22, 2018
b5649d7
update a couple of things
temp1011 May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ compileJava {
}

minecraft {
version = "14.23.1.2582"
version = "14.23.3.2655"
runDir = "run"

replace "@VERSION@", project.version
Expand All @@ -31,7 +31,7 @@ minecraft {
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20170903"
mappings = "snapshot_20171003"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
useDepAts = true
}
Expand All @@ -55,7 +55,7 @@ repositories {
}

dependencies {
deobfCompile "blusunrize:ImmersiveEngineering:0.12-79-+"
deobfCompile "blusunrize:ImmersiveEngineering:0.12-83-+"
deobfCompile "mezz.jei:jei_1.12.2:4.8.5.133"
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.9.289"
deobfCompile "elucent:albedo:2.0-SNAPSHOT"
Expand Down
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/main/java/flaxbeard/immersivepetroleum/common/blocks/BlockIPBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s
entityIn.motionY=.05;
return;
}
if(entityIn.isCollidedHorizontally)
if(entityIn.collidedHorizontally)
entityIn.motionY=.2;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/flaxbeard/immersivepetroleum/common/blocks/BlockIPMetalMultiblocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s
entityIn.motionY=.05;
return;
}
if(entityIn.isCollidedHorizontally)
if(entityIn.collidedHorizontally)
entityIn.motionY=.2;
}
}
Expand Down
Loading