Skip to content

Commit 973b174

Browse files
committed
Merge pull request #22 from jlbrewer/master
ValvePipes config (DenPipes in 1.5
2 parents e93faa5 + 8cac059 commit 973b174

File tree

3 files changed

+74
-75
lines changed

3 files changed

+74
-75
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
output=/mods/
2+
3+
1.1=/DenPipes/textures/blocks/valve_pipe
4+
1.2=/DenPipes-Forestry/textures/blocks/placeholder/cobblestone_gold_waterproof
5+
1.3=/DenPipes-Unused/stone_gold_watterproof
6+
1.4=/DenPipes/textures/blocks/automatic_wooden_pipe
7+
1.5=/DenPipes-Unused/sandstone_gold_waterproof
8+
1.6=/DenPipes-Unused/unknown1_pipe
9+
1.7=/DenPipes-Unused/cobblestone_industrial_waterproof
10+
1.8=/DenPipes-Unused/stone_industrial_waterproof
11+
1.9=/DenPipes-Unused/power_switch_pipe
12+
1.10=/DenPipes-Unused/sandstone_gold_power_pipe
13+
1.11=/DenPipes-Unused/unknown2_pipe
14+
1.12=/DenPipes=Unused/overlay_unknown2_pipe
15+
1.13=/DenPipes-Emerald/textures/blocks/automatic_emerald_pipe
16+
1.14=/DenPipes-Emerald/textures/blocks/overlay_automatic_emerald_pipe
17+
1.15=/DenPipes/textures/blocks/overlay_valve_pipe
18+
1.16=/DenPipes/textures/blocks/automatic_wooden_pipe
19+
20+
2.1=/DenPipes/textures/items/icon_pump
21+
2.2=/DenPipes/textures/items/icon_extract
22+
2.3=/DenPipes-Forestry/textures/items/icons/icon_closed
23+
2.4=/DenPipes-Unused/icon_open

gfx/thaumicbees/items/items.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ output=/mods/magicbees/textures/
1111
1.11=items/nuggetDiamond
1212
1.12=items/nuggetEmerald
1313

14-
2.1=items/crystalAspect
14+
2.3=items/crystalAspect
1515
2.4=items/jellyBabies
1616
2.5=items/thaumiumScoop
1717
2.6=items/thaumiumGrafter
Lines changed: 50 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,52 @@
1-
output=/textures/blocks/powercrystals/minefactoryreloaded/
1+
output=/textures/blocks/powercrystals/powerconverters/
22

3-
1.1=#
4-
1.2=tile.mfr.conveyor.stopped.default
5-
1.3=#
6-
1.4=tile.mfr.rubberwood.sapling
7-
1.5=tile.mfr.rubberwood.log.side
8-
1.6=tile.mfr.rubberwood.log.top
9-
1.7=tile.mfr.rubberwood.leaves.transparent
10-
1.8=tile.mfr.rubberwood.leaves.opaque
11-
1.9=tile.mfr.rail.cargo.dropoff
12-
1.10=tile.mfr.rail.cargo.pickup
13-
1.11=tile.mfr.rail.passenger.dropoff
14-
1.12=tile.mfr.rail.passenger.pickup
15-
1.13=tile.mfr.road
16-
1.14=tile.mfr.road.light.off
17-
1.15=tile.mfr.road.light.on
3+
1.1=tile.powerconverters.bc.consumer.off
4+
1.2=tile.powerconverters.bc.consumer.on
5+
1.3=tile.powerconverters.bc.producer.off
6+
1.4=tile.powerconverters.bc.producer.on
7+
1.5=tile.powerconverters.TEMPLATE
8+
1.6=tile.powerconverters.common.bridge
9+
1.7=tile.powerconverters.ic2.lv.consumer.off
10+
1.8=tile.powerconverters.ic2.lv.consumer.on
11+
1.9=tile.powerconverters.ic2.lv.producer.off
12+
1.10=tile.powerconverters.ic2.lv.producer.on
13+
1.11=tile.powerconverters.ic2.mv.consumer.off
14+
1.12=tile.powerconverters.ic2.mv.consumer.on
15+
1.13=tile.powerconverters.ic2.mv.producer.off
16+
1.14=tile.powerconverters.ic2.mv.producer.on
17+
1.15=tile.powerconverters.ic2.hv.consumer.off
18+
1.16=tile.powerconverters.ic2.hv.consumer.on
1819

19-
2.1=tile.mfr.stainedglass.white
20-
2.2=tile.mfr.stainedglass.orange
21-
2.3=tile.mfr.stainedglass.magenta
22-
2.4=tile.mfr.stainedglass.lightblue
23-
2.5=tile.mfr.stainedglass.yellow
24-
2.6=tile.mfr.stainedglass.lime
25-
2.7=tile.mfr.stainedglass.pink
26-
2.8=tile.mfr.stainedglass.gray
27-
2.9=tile.mfr.stainedglass.lightgray
28-
2.10=tile.mfr.stainedglass.cyan
29-
2.11=tile.mfr.stainedglass.purple
30-
2.12=tile.mfr.stainedglass.blue
31-
2.13=tile.mfr.stainedglass.brown
32-
2.14=tile.mfr.stainedglass.green
33-
2.15=tile.mfr.stainedglass.red
34-
2.16=tile.mfr.stainedglass.black
35-
36-
3.1=tile.mfr.stainedglass.pane.side.white
37-
3.2=tile.mfr.stainedglass.pane.side.orange
38-
3.3=tile.mfr.stainedglass.pane.side.magenta
39-
3.4=tile.mfr.stainedglass.pane.side.lightblue
40-
3.5=tile.mfr.stainedglass.pane.side.yellow
41-
3.6=tile.mfr.stainedglass.pane.side.lime
42-
3.7=tile.mfr.stainedglass.pane.side.pink
43-
3.8=tile.mfr.stainedglass.pane.side.gray
44-
3.9=tile.mfr.stainedglass.pane.side.lightgray
45-
3.10=tile.mfr.stainedglass.pane.side.cyan
46-
3.11=tile.mfr.stainedglass.pane.side.purple
47-
3.12=tile.mfr.stainedglass.pane.side.blue
48-
3.13=tile.mfr.stainedglass.pane.side.brown
49-
3.14=tile.mfr.stainedglass.pane.side.green
50-
3.15=tile.mfr.stainedglass.pane.side.red
51-
3.16=tile.mfr.stainedglass.pane.side.black
52-
53-
54-
4.1=tile.mfr.conveyor.stopped.white
55-
4.2=tile.mfr.conveyor.stopped.orange
56-
4.3=tile.mfr.conveyor.stopped.magenta
57-
4.4=tile.mfr.conveyor.stopped.lightblue
58-
4.5=tile.mfr.conveyor.stopped.yellow
59-
4.6=tile.mfr.conveyor.stopped.lime
60-
4.7=tile.mfr.conveyor.stopped.pink
61-
4.8=tile.mfr.conveyor.stopped.gray
62-
4.9=tile.mfr.conveyor.stopped.lightgray
63-
4.10=tile.mfr.conveyor.stopped.cyan
64-
4.11=tile.mfr.conveyor.stopped.purple
65-
4.12=tile.mfr.conveyor.stopped.blue
66-
4.13=tile.mfr.conveyor.stopped.brown
67-
4.14=tile.mfr.conveyor.stopped.green
68-
4.15=tile.mfr.conveyor.stopped.red
69-
4.16=tile.mfr.conveyor.stopped.black
70-
71-
6.1=tile.mfr.decorativebrick.glowstone
72-
6.2=tile.mfr.decorativebrick.ice
73-
6.3=tile.mfr.decorativebrick.lapis
74-
6.4=tile.mfr.decorativebrick.obsidian
75-
6.5=tile.mfr.decorativebrick.pavedstone
76-
6.6=tile.mfr.decorativebrick.snow
20+
2.1=tile.powerconverters.ic2.hv.producer.off
21+
2.2=tile.powerconverters.ic2.hv.producer.on
22+
2.3=tile.powerconverters.ic2.ev.consumer.off
23+
2.4=tile.powerconverters.ic2.ev.consumer.on
24+
2.6=tile.powerconverters.ic2.ev.producer.off
25+
2.6=tile.powerconverters.ic2.ev.producer.on
26+
2.7=tile.powerconverters.steam.consumer.off
27+
2.8=tile.powerconverters.steam.consumer.on
28+
2.9=tile.powerconverters.steam.producer.off
29+
2.10=tile.powerconverters.steam.producer.on
30+
2.11=tile.powerconverters.ue.lv.consumer.off
31+
2.12=tile.powerconverters.ue.lv.consumer.on
32+
2.13=tile.powerconverters.ue.lv.producer.off
33+
2.14=tile.powerconverters.ue.lv.producer.on
34+
2.15=tile.powerconverters.ue.mv.consumer.off
35+
2.16=tile.powerconverters.ue.mv.consumer.on
36+
37+
3.1=tile.powerconverters.ue.mv.producer.off
38+
3.2=tile.powerconverters.ue.mv.producer.on
39+
3.3=tile.powerconverters.ue.hv.consumer.off
40+
3.4=tile.powerconverters.ue.hv.consumer.on
41+
3.5=tile.powerconverters.ue.hv.producer.off
42+
3.6=tile.powerconverters.ue.hv.producer.on
43+
3.7=tile.powerconverters.common.charger.off
44+
3.8=tile.powerconverters.common.charger.on
45+
3.9=tile.powerconverters.fz.consumer.off
46+
3.10=tile.powerconverters.fz.consumer.on
47+
3.11=tile.powerconverters.fz.producer.off
48+
3.12=tile.powerconverters.fz.producer.on
49+
3.13=tile.powerconverters.ue.ev.consumer.off
50+
3.14=tile.powerconverters.ue.ev.consumer.on
51+
3.15=tile.powerconverters.ue.ev.producer.off
52+
3.16=tile.powerconverters.ue.ev.producer.on

0 commit comments

Comments
 (0)