Merge pull request #15 from progwml6/master

fix some issues with 1.7
This commit is contained in:
Chicken-Bones committed 2014-04-09 11:54:58 +10:00
commit d910584217
2 files changed
+5 -6

No files matched your search

+3 -5
View File
@@ -54,17 +54,15 @@ jar {
}
}
sourceSets {
main {
java {
srcDir '/'
include 'CodeChicken/**/*'
}
srcDir "\\"
include 'codechicken\\**\\*.java'
}
}
}
// Add in a source jar for people, should they desire to download such a thing
task sourceJar(type: Jar) {
from sourceSets.main.allSource
+2 -1
View File
@@ -65,7 +65,8 @@ public class TextureSpecial extends TextureAtlasSprite implements IIconSelfRegis
if (textureFX != null) {
textureFX.update();
if (textureFX.changed())
TextureUtil.uploadTextureSub(0, textureFX.imageData, width, height, originX, originY, false, false, false);
//TextureUtil.uploadTextureSub(0, textureFX.imageData, width, height, originX, originY, false, false, false); not accessible
TextureUtil.uploadTextureMipmap(new int[][]{textureFX.imageData}, width, height, originX, originY, false, false);
}
}