Build 1.4-8
Added the missing textures Fixed a few minor bugs
|
@ -1,5 +1,5 @@
|
||||||
def mainVersion = "1.3"
|
def mainVersion = "1.4"
|
||||||
def buildNumber = "8"
|
def buildNumber = "9"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This file is part of Industrial Wires.
|
* This file is part of Industrial Wires.
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
#####Version 1.4-9
|
||||||
|
- added Control Panels
|
||||||
|
- They can be used to control and monitor a lot of redstone signals from a few blocks
|
||||||
#####Version 1.3-8
|
#####Version 1.3-8
|
||||||
- the converters and the motor don't have missing textures any more when using Chisel
|
- the converters and the motor don't have missing textures any more when using Chisel
|
||||||
#####Version 1.3-7
|
#####Version 1.3-7
|
||||||
|
|
|
@ -322,7 +322,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
|
||||||
aabb = new AxisAlignedBB(0, 0, 0, h, 1, 1);
|
aabb = new AxisAlignedBB(0, 0, 0, h, 1, 1);
|
||||||
break;
|
break;
|
||||||
case EAST:
|
case EAST:
|
||||||
aabb = new AxisAlignedBB(1-h, 0, 0, 0, 1, 1);
|
aabb = new AxisAlignedBB(1-h, 0, 0, 1, 1, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ public class PanelModel implements IBakedModel {
|
||||||
new ItemTransformVec3f(new Vector3f(), new Vector3f(0, .1F, 0), new Vector3f(.25F, .25F, .25F)),//Ground
|
new ItemTransformVec3f(new Vector3f(), new Vector3f(0, .1F, 0), new Vector3f(.25F, .25F, .25F)),//Ground
|
||||||
new ItemTransformVec3f(new Vector3f(0, 180, 45), new Vector3f(0, 0, -.1875F), new Vector3f(.5F, .5F, .5F)));//Fixed;
|
new ItemTransformVec3f(new Vector3f(0, 180, 45), new Vector3f(0, 0, -.1875F), new Vector3f(.5F, .5F, .5F)));//Fixed;
|
||||||
@Override
|
@Override
|
||||||
public ItemCameraTransforms getItemCameraTransforms() {//TODO very much cache this!
|
public ItemCameraTransforms getItemCameraTransforms() {
|
||||||
return transform;
|
return transform;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -147,6 +147,11 @@ public class CoveredToggleSwitch extends ToggleSwitch {
|
||||||
return super.fomatConfigDescription(type, id);
|
return super.fomatConfigDescription(type, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getColor() {
|
||||||
|
return color;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) return true;
|
if (this == o) return true;
|
||||||
|
|
|
@ -33,6 +33,8 @@ item.industrialwires.panel_component.label.name=Label
|
||||||
item.industrialwires.panel_component.indicator_light.name=Indicator Light
|
item.industrialwires.panel_component.indicator_light.name=Indicator Light
|
||||||
item.industrialwires.panel_component.slider.name=Slider
|
item.industrialwires.panel_component.slider.name=Slider
|
||||||
item.industrialwires.panel_component.variac.name=Variac®
|
item.industrialwires.panel_component.variac.name=Variac®
|
||||||
|
item.industrialwires.panel_component.toggle_switch.name=Toggle Switch
|
||||||
|
item.industrialwires.panel_component.toggle_switch_covered.name=Covered Toggle Switch
|
||||||
|
|
||||||
|
|
||||||
industrialwires.desc.wireLength=Wire length: %1s block(s)
|
industrialwires.desc.wireLength=Wire length: %1s block(s)
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent":"item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0":"industrialwires:items/switch"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"parent":"item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0":"industrialwires:items/switch",
|
||||||
|
"layer1":"industrialwires:items/switch_cover"
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent":"item/generated",
|
"parent":"item/generated",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0":"industrialwires:items/background",
|
"layer0":"industrialwires:items/variac"
|
||||||
"layer1":"industrialwires:items/button"//TODO change when there is a proper texture for it
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 491 B |
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 467 B After Width: | Height: | Size: 502 B |
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 451 B After Width: | Height: | Size: 480 B |
After Width: | Height: | Size: 507 B |
After Width: | Height: | Size: 199 B |
After Width: | Height: | Size: 513 B |