diff --git a/cube-pattern.acorn b/cube-pattern.acorn new file mode 100644 index 00000000..30b9b8f2 Binary files /dev/null and b/cube-pattern.acorn differ diff --git a/data/big_reactors/items/5_core_passive_reactor/icon.png b/data/big_reactors/items/5_core_passive_reactor/icon.png new file mode 100644 index 00000000..a3c793e5 Binary files /dev/null and b/data/big_reactors/items/5_core_passive_reactor/icon.png differ diff --git a/data/big_reactors/items/smallest_passive_reactor/icon.png b/data/big_reactors/items/smallest_passive_reactor/icon.png new file mode 100644 index 00000000..d51d53b2 Binary files /dev/null and b/data/big_reactors/items/smallest_passive_reactor/icon.png differ diff --git a/data/big_reactors/versions/0.4.2A2/mod-version.cg b/data/big_reactors/versions/0.4.2A2/mod-version.cg index a365fd6b..c6334912 100644 --- a/data/big_reactors/versions/0.4.2A2/mod-version.cg +++ b/data/big_reactors/versions/0.4.2A2/mod-version.cg @@ -304,6 +304,26 @@ group: Reactor Parts pattern: 101 121 101 tools: Crafting Table +group: Reactors + + item: Smallest Passive Reactor + multiblock: + input: Reactor Controller, Reactor Power Tap, Reactor Access Port, Reactor Control Rod, Yellorium Fuel Rod, Reactor Casing + layer: 555 555 555 + layer: 555 142 505 + layer: 555 535 555 + + item: 5-Core Passive Reactor + multiblock: + input: Reactor Controller, Reactor Power Tap, Reactor Access Port, Reactor Control Rod, Yellorium Fuel Rod, Reactor Casing, 1000 Gelid Cryotheum, Reactor Glass + layer: 5555555 5555555 5555555 5555555 5555555 5555555 5555555 + layer: 5770775 7666667 7646467 1664662 7646467 7666667 5777775 + layer: 5777775 7666667 7646467 7664667 7646467 7666667 5777775 + layer: 5777775 7666667 7646467 7664667 7646467 7666667 5777775 + layer: 5777775 7666667 7646467 7664667 7646467 7666667 5777775 + layer: 5777775 7666667 7646467 7664667 7646467 7666667 5777775 + layer: 5555555 5.....5 5.3.3.5 5..3..5 5.3.3.5 5.....5 5555555 + group: Turbine Parts item: Turbine Computer Port diff --git a/data/minecraft/items/lava/icon.png b/data/minecraft/items/lava/icon.png index d4affe3d..d4d6a013 100644 Binary files a/data/minecraft/items/lava/icon.png and b/data/minecraft/items/lava/icon.png differ diff --git a/data/minecraft/items/nether_portal/icon.png b/data/minecraft/items/nether_portal/icon.png new file mode 100644 index 00000000..e821db0c Binary files /dev/null and b/data/minecraft/items/nether_portal/icon.png differ diff --git a/data/minecraft/items/water/icon.png b/data/minecraft/items/water/icon.png index de9c270c..6829d9bd 100644 Binary files a/data/minecraft/items/water/icon.png and b/data/minecraft/items/water/icon.png differ diff --git a/data/minecraft/versions/1.7.10/mod-version.cg b/data/minecraft/versions/1.7.10/mod-version.cg index 458ea299..04a548e3 100644 --- a/data/minecraft/versions/1.7.10/mod-version.cg +++ b/data/minecraft/versions/1.7.10/mod-version.cg @@ -1595,6 +1595,17 @@ group: Plants item: White Tulip gatherable: yes +group: Portals + + item: Nether Portal + multiblock: + input: Obsidian + layer: .00. + layer: 0..0 + layer: 0..0 + layer: 0..0 + layer: .00. + group: Potions: Brewing item: Awkward Potion diff --git a/data/railcraft/items/blast_furnace/icon.png b/data/railcraft/items/blast_furnace/icon.png index 69b1f3cb..4aac7649 100644 Binary files a/data/railcraft/items/blast_furnace/icon.png and b/data/railcraft/items/blast_furnace/icon.png differ diff --git a/data/railcraft/items/blast_furnace_bottom_half/icon.png b/data/railcraft/items/blast_furnace_bottom_half/icon.png deleted file mode 100644 index 43a92326..00000000 Binary files a/data/railcraft/items/blast_furnace_bottom_half/icon.png and /dev/null differ diff --git a/data/railcraft/items/blast_furnace_inner_layer/icon.png b/data/railcraft/items/blast_furnace_inner_layer/icon.png deleted file mode 100644 index 53365f06..00000000 Binary files a/data/railcraft/items/blast_furnace_inner_layer/icon.png and /dev/null differ diff --git a/data/railcraft/items/blast_furnace_outer_layer/icon.png b/data/railcraft/items/blast_furnace_outer_layer/icon.png deleted file mode 100644 index 81bf6956..00000000 Binary files a/data/railcraft/items/blast_furnace_outer_layer/icon.png and /dev/null differ diff --git a/data/railcraft/items/coke_oven/icon.png b/data/railcraft/items/coke_oven/icon.png index 0657d928..af897638 100644 Binary files a/data/railcraft/items/coke_oven/icon.png and b/data/railcraft/items/coke_oven/icon.png differ diff --git a/data/railcraft/items/coke_oven_layer/icon.png b/data/railcraft/items/coke_oven_layer/icon.png deleted file mode 100644 index c06d5f5a..00000000 Binary files a/data/railcraft/items/coke_oven_layer/icon.png and /dev/null differ diff --git a/data/railcraft/items/icon.png b/data/railcraft/items/icon.png new file mode 100644 index 00000000..1b826c01 Binary files /dev/null and b/data/railcraft/items/icon.png differ diff --git a/data/railcraft/items/iron_tank_3x3x3/icon.png b/data/railcraft/items/iron_tank_3x3x3/icon.png new file mode 100644 index 00000000..035049e0 Binary files /dev/null and b/data/railcraft/items/iron_tank_3x3x3/icon.png differ diff --git a/data/railcraft/items/iron_tank_5x5x5/icon.png b/data/railcraft/items/iron_tank_5x5x5/icon.png new file mode 100644 index 00000000..ea5d80b4 Binary files /dev/null and b/data/railcraft/items/iron_tank_5x5x5/icon.png differ diff --git a/data/railcraft/items/iron_tank_7x7x7/icon.png b/data/railcraft/items/iron_tank_7x7x7/icon.png new file mode 100644 index 00000000..158a1db9 Binary files /dev/null and b/data/railcraft/items/iron_tank_7x7x7/icon.png differ diff --git a/data/railcraft/items/iron_tank_9x9x8/icon.png b/data/railcraft/items/iron_tank_9x9x8/icon.png new file mode 100644 index 00000000..ba65c80c Binary files /dev/null and b/data/railcraft/items/iron_tank_9x9x8/icon.png differ diff --git a/data/railcraft/items/rock_crusher/icon.png b/data/railcraft/items/rock_crusher/icon.png index bc950853..f2938b50 100644 Binary files a/data/railcraft/items/rock_crusher/icon.png and b/data/railcraft/items/rock_crusher/icon.png differ diff --git a/data/railcraft/items/steam_boiler_high_pressure_1x1x1/icon.png b/data/railcraft/items/steam_boiler_high_pressure_1x1x1/icon.png new file mode 100644 index 00000000..9cef417e Binary files /dev/null and b/data/railcraft/items/steam_boiler_high_pressure_1x1x1/icon.png differ diff --git a/data/railcraft/items/steam_boiler_high_pressure_2x2x2/icon.png b/data/railcraft/items/steam_boiler_high_pressure_2x2x2/icon.png new file mode 100644 index 00000000..de723bee Binary files /dev/null and b/data/railcraft/items/steam_boiler_high_pressure_2x2x2/icon.png differ diff --git a/data/railcraft/items/steam_boiler_high_pressure_3x4x3/icon.png b/data/railcraft/items/steam_boiler_high_pressure_3x4x3/icon.png new file mode 100644 index 00000000..1d989136 Binary files /dev/null and b/data/railcraft/items/steam_boiler_high_pressure_3x4x3/icon.png differ diff --git a/data/railcraft/items/steam_boiler_low_pressure_1x1x1/icon.png b/data/railcraft/items/steam_boiler_low_pressure_1x1x1/icon.png new file mode 100644 index 00000000..c7119a37 Binary files /dev/null and b/data/railcraft/items/steam_boiler_low_pressure_1x1x1/icon.png differ diff --git a/data/railcraft/items/steam_boiler_low_pressure_2x2x2/icon.png b/data/railcraft/items/steam_boiler_low_pressure_2x2x2/icon.png new file mode 100644 index 00000000..26532d06 Binary files /dev/null and b/data/railcraft/items/steam_boiler_low_pressure_2x2x2/icon.png differ diff --git a/data/railcraft/items/steam_boiler_low_pressure_3x4x3/icon.png b/data/railcraft/items/steam_boiler_low_pressure_3x4x3/icon.png new file mode 100644 index 00000000..4cfc595e Binary files /dev/null and b/data/railcraft/items/steam_boiler_low_pressure_3x4x3/icon.png differ diff --git a/data/railcraft/items/steel_tank_3x3x3/icon.png b/data/railcraft/items/steel_tank_3x3x3/icon.png new file mode 100644 index 00000000..14188561 Binary files /dev/null and b/data/railcraft/items/steel_tank_3x3x3/icon.png differ diff --git a/data/railcraft/items/steel_tank_5x5x5/icon.png b/data/railcraft/items/steel_tank_5x5x5/icon.png new file mode 100644 index 00000000..d77a8aa5 Binary files /dev/null and b/data/railcraft/items/steel_tank_5x5x5/icon.png differ diff --git a/data/railcraft/items/steel_tank_7x7x7/icon.png b/data/railcraft/items/steel_tank_7x7x7/icon.png new file mode 100644 index 00000000..78c09867 Binary files /dev/null and b/data/railcraft/items/steel_tank_7x7x7/icon.png differ diff --git a/data/railcraft/items/steel_tank_9x9x8/icon.png b/data/railcraft/items/steel_tank_9x9x8/icon.png new file mode 100644 index 00000000..5a2441a2 Binary files /dev/null and b/data/railcraft/items/steel_tank_9x9x8/icon.png differ diff --git a/data/railcraft/versions/9.5.0/mod-version.cg b/data/railcraft/versions/9.5.0/mod-version.cg index 9830236e..ab0150dd 100644 --- a/data/railcraft/versions/9.5.0/mod-version.cg +++ b/data/railcraft/versions/9.5.0/mod-version.cg @@ -2473,14 +2473,12 @@ group: Minerals group: Multi-Block Structures item: Blast Furnace - recipe: - input: Blast Furnace (bottom half), Blast Furnace (inner layer), Blast Furnace (outer layer) - pattern: .2. .1. .0. - - item: Blast Furnace (bottom half) - recipe: - input: Blast Furnace (inner layer), Blast Furnace (outer layer) - pattern: ... .0. .1. + multiblock: + input: Blast Furnace Brick + layer: 000 000 000 + layer: 000 0.0 000 + layer: 000 0.0 000 + layer: 000 000 000 item: Blast Furnace Brick recipe: @@ -2489,20 +2487,12 @@ group: Multi-Block Structures quantity: 4 tools: Crafting Table - item: Blast Furnace (inner layer) - recipe: - input: Blast Furnace Brick - pattern: 000 0.0 000 - - item: Blast Furnace (outer layer) - recipe: - input: Blast Furnace Brick - pattern: 000 000 000 - item: Coke Oven - recipe: - input: Coke Oven Layer - pattern: .0. .0. .0. + multiblock: + input: Coke Oven Brick + layer: 000 000 000 + layer: 000 0.0 000 + layer: 000 000 000 item: Coke Oven Brick recipe: @@ -2510,15 +2500,11 @@ group: Multi-Block Structures pattern: 101 010 101 tools: Crafting Table - item: Coke Oven (layer) - recipe: - input: Coke Oven Brick - pattern: 000 000 000 - item: Rock Crusher - recipe: - input: Rock Crusher (layer) - pattern: ... .0. .0. + multiblock: + input: Rock Crusher (block) + layer: 000 000 + layer: 000 000 item: Rock Crusher (block) recipe: @@ -2527,15 +2513,128 @@ group: Multi-Block Structures quantity: 4 tools: Crafting Table - item: Rock Crusher (layer) - recipe: - input: Rock Crusher (block) - pattern: ... 000 000 - - item: Steam Boiler (simple) - recipe: + item: Steam Boiler (Low Pressure 1x1x1) + multiblock: input: Low Pressure Boiler Tank, Solid Fueled Boiler Firebox - pattern: ... .0. .1. + layer: 1 + layer: 0 + + item: Steam Boiler (Low Pressure 2x2x2) + multiblock: + input: Low Pressure Boiler Tank, Solid Fueled Boiler Firebox + layer: 11 11 + layer: 00 00 + layer: 00 00 + + item: Steam Boiler (Low Pressure 3x4x3) + multiblock: + input: Low Pressure Boiler Tank, Solid Fueled Boiler Firebox + layer: 111 111 111 + layer: 000 000 000 + layer: 000 000 000 + layer: 000 000 000 + layer: 000 000 000 + + item: Steam Boiler (High Pressure 1x1x1) + multiblock: + input: High Pressure Boiler Tank, Solid Fueled Boiler Firebox + layer: 1 + layer: 0 + + item: Steam Boiler (High Pressure 2x2x2) + multiblock: + input: High Pressure Boiler Tank, Solid Fueled Boiler Firebox + layer: 11 11 + layer: 00 00 + layer: 00 00 + + item: Steam Boiler (High Pressure 3x4x3) + multiblock: + input: High Pressure Boiler Tank, Solid Fueled Boiler Firebox + layer: 111 111 111 + layer: 000 000 000 + layer: 000 000 000 + layer: 000 000 000 + layer: 000 000 000 + + item: Iron Tank (3x3x3) + multiblock: + input: Iron Tank Wall, Iron Tank Gauge, Iron Tank Valve + layer: 000 000 000 + layer: 020 1.1 020 + layer: 000 000 000 + + item: Iron Tank (5x5x5) + multiblock: + input: Iron Tank Wall, Iron Tank Gauge, Iron Tank Valve + layer: 00000 00000 00000 00000 00000 + layer: 01110 1...1 2...2 1...1 01110 + layer: 01110 1...1 1...1 1...1 01110 + layer: 01110 1...1 1...1 1...1 01110 + layer: 00000 00000 00000 00000 00000 + + item: Iron Tank (7x7x7) + multiblock: + input: Iron Tank Wall, Iron Tank Gauge, Iron Tank Valve + layer: 0000000 0000000 0000000 0000000 0000000 0000000 0000000 + layer: 0111110 1.....1 1.....1 2.....2 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0000000 0000000 0000000 0000000 0000000 0000000 0000000 + + item: Iron Tank (9x9x8) + multiblock: + input: Iron Tank Wall, Iron Tank Gauge, Iron Tank Valve + layer: 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 + layer: 011111110 1.......1 1.......1 1.......1 2.......2 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 + + item: Steel Tank (3x3x3) + multiblock: + input: Steel Tank Wall, Steel Tank Gauge, Steel Tank Valve + layer: 000 000 000 + layer: 020 1.1 020 + layer: 000 000 000 + + item: Steel Tank (5x5x5) + multiblock: + input: Steel Tank Wall, Steel Tank Gauge, Steel Tank Valve + layer: 00000 00000 00000 00000 00000 + layer: 01110 1...1 2...2 1...1 01110 + layer: 01110 1...1 1...1 1...1 01110 + layer: 01110 1...1 1...1 1...1 01110 + layer: 00000 00000 00000 00000 00000 + + item: Steel Tank (7x7x7) + multiblock: + input: Steel Tank Wall, Steel Tank Gauge, Steel Tank Valve + layer: 0000000 0000000 0000000 0000000 0000000 0000000 0000000 + layer: 0111110 1.....1 1.....1 2.....2 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0111110 1.....1 1.....1 1.....1 1.....1 1.....1 0111110 + layer: 0000000 0000000 0000000 0000000 0000000 0000000 0000000 + + item: Steel Tank (9x9x8) + multiblock: + input: Steel Tank Wall, Steel Tank Gauge, Steel Tank Valve + layer: 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 + layer: 011111110 1.......1 1.......1 1.......1 2.......2 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 011111110 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 1.......1 011111110 + layer: 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 000000000 + group: Signals diff --git a/data/thermal_expansion/items/blazing_pyrotheum/cube-pattern.png b/data/thermal_expansion/items/blazing_pyrotheum/cube-pattern.png new file mode 100644 index 00000000..9890d9e6 Binary files /dev/null and b/data/thermal_expansion/items/blazing_pyrotheum/cube-pattern.png differ diff --git a/data/thermal_expansion/items/blazing_pyrotheum/icon.png b/data/thermal_expansion/items/blazing_pyrotheum/icon.png index 9683c248..9890d9e6 100644 Binary files a/data/thermal_expansion/items/blazing_pyrotheum/icon.png and b/data/thermal_expansion/items/blazing_pyrotheum/icon.png differ diff --git a/data/thermal_expansion/items/destabilized_redstone/icon.png b/data/thermal_expansion/items/destabilized_redstone/icon.png index 83a03aee..4b8e31de 100644 Binary files a/data/thermal_expansion/items/destabilized_redstone/icon.png and b/data/thermal_expansion/items/destabilized_redstone/icon.png differ diff --git a/data/thermal_expansion/items/energized_glowstone/icon.png b/data/thermal_expansion/items/energized_glowstone/icon.png index bff007a0..3c4c66f6 100644 Binary files a/data/thermal_expansion/items/energized_glowstone/icon.png and b/data/thermal_expansion/items/energized_glowstone/icon.png differ diff --git a/data/thermal_expansion/items/gelid_cryotheum/icon.png b/data/thermal_expansion/items/gelid_cryotheum/icon.png index 680d1c28..43e9457c 100644 Binary files a/data/thermal_expansion/items/gelid_cryotheum/icon.png and b/data/thermal_expansion/items/gelid_cryotheum/icon.png differ diff --git a/data/thermal_expansion/items/liquifacted_coal/icon.png b/data/thermal_expansion/items/liquifacted_coal/icon.png index d2c84ea3..c2b40588 100644 Binary files a/data/thermal_expansion/items/liquifacted_coal/icon.png and b/data/thermal_expansion/items/liquifacted_coal/icon.png differ diff --git a/data/thermal_expansion/items/primal_mana/icon.png b/data/thermal_expansion/items/primal_mana/icon.png index 93d7132d..fa898ea1 100644 Binary files a/data/thermal_expansion/items/primal_mana/icon.png and b/data/thermal_expansion/items/primal_mana/icon.png differ diff --git a/data/thermal_expansion/items/resonant_ender/icon.png b/data/thermal_expansion/items/resonant_ender/icon.png index 68948a73..3d54fa89 100644 Binary files a/data/thermal_expansion/items/resonant_ender/icon.png and b/data/thermal_expansion/items/resonant_ender/icon.png differ diff --git a/data/thermal_expansion/items/steam/icon.png b/data/thermal_expansion/items/steam/icon.png index 156058c8..deb5a2f4 100644 Binary files a/data/thermal_expansion/items/steam/icon.png and b/data/thermal_expansion/items/steam/icon.png differ