aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle7
-rw-r--r--build.properties6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java3
-rw-r--r--src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java4
4 files changed, 16 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index d8aac059a3..414af8c300 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,10 @@ repositories {
name 'CoFHCore'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
}
+ maven {
+ name = "chickenbones"
+ url = "http://chickenbones.net/maven/"
+ }
}
dependencies {
@@ -73,6 +77,9 @@ dependencies {
compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
+ compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
+ compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
+ compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
}
task getGregTech(type: Download) {
diff --git a/build.properties b/build.properties
index 5bcb388e16..f8ddcc7a75 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,9 @@ forge.version=10.13.4.1614-1.7.10
tectech.version=3.4.5
ic2.version=2.2.790-experimental
-nei.version=1.0.3.74
+codechickenlib.version=1.1.3.140
+codechickencore.version=1.0.7.47
+nei.version=1.0.5.120
gregtech.jenkinsbuild=718
gregtech.version=5.09.31.22
cofhcore.cf=2246/920
@@ -11,4 +13,4 @@ cofhcore.version=[1.7.10]3.0.3-303-dev
cofhlib.cf=2246/918
cofhlib.version=[1.7.10]1.0.3-175-dev
-yamcore.version=0.5.74 \ No newline at end of file
+yamcore.version=0.5.76 \ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java
index edc6f6017b..a536ad52af 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java
@@ -68,6 +68,9 @@ public class ConstructibleTriggerItem extends Item {
public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
aList.add(CommonValues.tecMark);
aList.add("Triggers Constructible Interface");
+ aList.add(EnumChatFormatting.BLUE + "Shows multiblock construction details,");
+ aList.add(EnumChatFormatting.BLUE + "just Use on a multiblock controller.");
+ aList.add(EnumChatFormatting.BLUE + "(Sneak Use in creative to build)");
aList.add(EnumChatFormatting.BLUE + "Quantity affects construction details");
}
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
index 4ce942958b..0fb915e035 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
+++ b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
@@ -34,7 +34,7 @@ public class projectileRenderEM extends Render {
float f4 = (float)(b0 * 10) / 32.0F;
float f5 = (float)(5 + b0 * 10) / 32.0F;
float f10 = 0.05625F;
- GL11.glEnable('耺');
+ GL11.glEnable('\u803a');
float f11 = - par9;
if(f11 > 0.0F) {
float i = -MathHelper.sin(f11 * 3.0F) * f11;
@@ -60,7 +60,7 @@ public class projectileRenderEM extends Render {
}
GL11.glEnable(2896);
- GL11.glDisable('耺');
+ GL11.glDisable('\u803a');
GL11.glPopMatrix();
}