diff --git a/buildcraft_resources/assets/buildcraft/logo.png b/buildcraft_resources/assets/buildcraft/logo.png old mode 100644 new mode 100755 index 10cebb09..205d674d Binary files a/buildcraft_resources/assets/buildcraft/logo.png and b/buildcraft_resources/assets/buildcraft/logo.png differ diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/led_green.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/led_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/led_red.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/led_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/default.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/recording.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/recording.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_green.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_red.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/box.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/box.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/clear.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/clear.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/cylinder.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/cylinder.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/fill.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/fill.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/flatten.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/flatten.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/frame.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/frame.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/horizon.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/horizon.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/pyramid.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/pyramid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/stairs.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/stairs.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/markerBlock/default.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/markerBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/active.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/default.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/architect_gui.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/architect_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_blueprint.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_blueprint.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_foreground.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_foreground.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/filler.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/library_rw.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/library_rw.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_filler.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_place_block.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_place_block.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tools.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tools.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/clean.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/clean.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/used.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/used.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/default.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/recording.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/recording.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_filler.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_path.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_path.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/clean.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/clean.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/used.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/used.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_green.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_overheat.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_overheat.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_red.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_yellow.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png old mode 100644 new mode 100755 index 1e4ac3d6..b8aa2a51 Binary files a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png and b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png differ diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/box.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/box.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/clear.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/clear.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/cylinder.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/cylinder.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/fill.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/fill.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/flatten.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/flatten.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/horizon.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/horizon.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/pyramid.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/pyramid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/stairs.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/stairs.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockBlueLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockBlueLaser.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockRedLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockRedLaser.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockStripesLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockStripesLaser.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_dark.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_lit.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_cyan.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_cyan.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_dark.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_lit.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_dark.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_lit.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_dark.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_lit.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/transparent.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/transparent.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/buttons.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/buttons.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_one_slot.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_one_slot.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_ui.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_ui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/icon_button.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/icon_button.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/ledger.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/ledger.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/list.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/list.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/gui/slot.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/slot.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/diamondGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/diamondGearItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_down.png b/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_down.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_up.png b/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_up.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/goldGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/goldGearItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/icons/energy.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/energy.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_1.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_1.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_2.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_2.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_3.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_3.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_4.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_4.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/ironGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/ironGearItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/list/clean.png b/buildcraft_resources/assets/buildcraftcore/textures/items/list/clean.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/list/used.png b/buildcraft_resources/assets/buildcraftcore/textures/items/list/used.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/area.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/area.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/clean.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/clean.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/path.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/path.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/spot.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/spot.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/zone.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/zone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/stoneGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/stoneGearItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_loop.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_loop.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_off.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_off.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_on.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_on.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_redstoneoutput.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_redstoneoutput.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_black.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_black.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_brown.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_brown.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_cyan.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_cyan.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_gray.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_gray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_green.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_gray.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_gray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_lime.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_lime.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_magenta.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_magenta.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_orange.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_orange.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_pink.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_pink.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_purple.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_purple.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_red.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_white.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_white.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_yellow.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/redstone_gate_side_only.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/redstone_gate_side_only.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_down.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_down.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_east.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_east.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_north.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_north.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_south.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_south.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_up.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_up.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_west.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_west.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below25.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below25.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below50.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below50.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below75.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below75.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_contains.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_contains.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_empty.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_empty.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_full.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_full.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_space.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_space.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below25.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below25.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below50.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below50.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below75.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below75.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_contains.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_contains.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_empty.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_empty.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_full.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_full.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_space.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_space.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_active.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_inactive.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_active.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_inactive.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/unknown.png b/buildcraft_resources/assets/buildcraftcore/textures/items/unknown.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/woodenGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/woodenGearItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/wrenchItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/wrenchItem.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_1.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_1.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_2.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_2.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_3.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_3.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_4.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_4.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/stripes.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/stripes.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png.mcmeta old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png.mcmeta old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png.mcmeta old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png.mcmeta old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/gui/combustion_engine_gui.png b/buildcraft_resources/assets/buildcraftenergy/textures/gui/combustion_engine_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/gui/steam_engine_gui.png b/buildcraft_resources/assets/buildcraftenergy/textures/gui/steam_engine_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketFuel.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketFuel.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketOil.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketOil.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketRedplasma.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketRedplasma.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_blue.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_green.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_overheat.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_overheat.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_red.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_yellow.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/default.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/topbottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/topbottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/frameBlock/default.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/frameBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/bottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/middle.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/middle.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/display.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/display.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png old mode 100644 new mode 100755 index d1c04c33..31271b68 Binary files a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png differ diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png old mode 100644 new mode 100755 index 59d16f41..bffdde2d Binary files a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png differ diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png index 0729cfb6..50ed703b 100755 Binary files a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png differ diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/item_hatch.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/item_hatch.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/led_green.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/led_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/led_red.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/led_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/item_hatch.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/item_hatch.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/led_green.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/led_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/led_red.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/led_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png old mode 100644 new mode 100755 index fa1b59b4..b842c299 Binary files a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png differ diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/led_green.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/led_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/led_red.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/led_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png old mode 100644 new mode 100755 index 4684652b..e4e0ac42 Binary files a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png differ diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/default.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/refinery.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/refinery.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side_stacked.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side_stacked.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/topbottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/topbottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/gui/autobench.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/autobench.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/gui/hopper_gui.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/hopper_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/gui/refinery_filter.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/refinery_filter.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png index ab5ee522..b8f89c91 100755 Binary files a/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png and b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png differ diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/topbottom.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/topbottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/default.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/default.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/overlay_bottom.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/overlay_bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/overlay_side.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/overlay_side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_butcher.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_butcher.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_farmer.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_farmer.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_harvester.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_harvester.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_military.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_military.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_miner.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_miner.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_stripes.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_stripes.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/gui/requester_gui.png b/buildcraft_resources/assets/buildcraftrobotics/textures/gui/requester_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png b/buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/blue.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/clean.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/clean.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/green.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/red.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/unknown.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/unknown.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/yellow.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter_tool.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter_tool.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_in_area.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_in_area.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_inventory.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_inventory.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_wakeup.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_wakeup.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_fluids.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_fluids.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_items.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_items.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_allow_craft.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_allow_craft.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_drop_in_pipe.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_drop_in_pipe.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_machine_request.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_machine_request.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_request_items.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_request_items.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_forbidden.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_forbidden.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_mandatory.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_mandatory.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_in_station.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_in_station.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_linked.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_linked.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_reserved.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_reserved.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_sleep.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_sleep.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png old mode 100644 new mode 100755 index 6cfa1f7c..edd12e12 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png old mode 100644 new mode 100755 index 438cf170..91ba1cba Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png old mode 100644 new mode 100755 index 1630bfeb..d90d7615 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/bottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/side.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/top.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_advancedworkbench.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_advancedworkbench.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png old mode 100644 new mode 100755 index d82c79ef..714cef16 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/charging_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/charging_table.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/integration_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/integration_table.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png old mode 100644 new mode 100755 index d6c7e277..5ced914a Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png old mode 100644 new mode 100755 index 67261fe5..9f1e83eb Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta old mode 100644 new mode 100755 index f6730e30..6cc687f6 --- a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta +++ b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 4 + "frametime": 5 } } \ No newline at end of file diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png old mode 100644 new mode 100755 index bab28a8b..7ce9901c Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png old mode 100644 new mode 100755 index fb3e4d81..8e82ed12 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png old mode 100644 new mode 100755 index e8b91e90..7470a673 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt.png new file mode 100755 index 00000000..6500a73d Binary files /dev/null and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt2.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt2.png new file mode 100755 index 00000000..8af8177b Binary files /dev/null and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset_alt2.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png old mode 100644 new mode 100755 index b2a92ff6..45f11575 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png old mode 100644 new mode 100755 index 43203284..fbd1feac Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png old mode 100644 new mode 100755 index 52b0f89e..ff0acff4 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png old mode 100644 new mode 100755 index 7837f0ab..d9e69bc8 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png differ diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png index 1939b34c..fc6531f9 100755 Binary files a/buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png and b/buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png old mode 100644 new mode 100755 index cd0a372b..624a7d92 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png old mode 100644 new mode 100755 index 2669779b..1579262e Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png old mode 100644 new mode 100755 index fbb86a5a..25de7685 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png old mode 100644 new mode 100755 index e73bcb26..427a7d08 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png old mode 100644 new mode 100755 index 6d01fdb2..9d886898 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png old mode 100644 new mode 100755 index d6fc5daa..b5bc4aa9 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png.mcmeta b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png.mcmeta new file mode 100755 index 00000000..7e77c648 --- /dev/null +++ b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png old mode 100644 new mode 100755 index 5084e92e..7d8f6dd9 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_diamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_diamond.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_emerald.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_gold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_gold.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_iron.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_iron.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_quartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_quartz.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png old mode 100644 new mode 100755 index 61276e32..4474921c Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png old mode 100644 new mode 100755 index fbb86a5a..ab781989 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png old mode 100644 new mode 100755 index e73bcb26..087631a8 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png and b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/itemBox.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/itemBox.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllDaizuli_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllDaizuli_solid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmerald_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmerald_solid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllIron_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllIron_solid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllWood_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllWood_solid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFilter.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFilter.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsCobblestone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_center.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_center.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_down.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_down.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_east.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_east.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_item.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_item.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_north.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_north.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_south.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_south.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_up.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_up.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west_cb.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsEmerald_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsGold.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsIron_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsIron_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsQuartz.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsSandstone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsStone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsVoid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsVoid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsWood_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsClay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsClay.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsCobblestone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_black.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_black.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_brown.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_brown.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_cyan.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_cyan.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_gray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_gray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightblue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightblue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightgray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightgray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lime.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lime.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_magenta.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_magenta.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_orange.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_orange.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_pink.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_pink.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_purple.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_purple.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_white.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_white.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_center.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_center.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_down.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_down.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_east.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_east.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_item.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_item.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_north.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_north.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_south.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_south.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_up.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_up.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west_cb.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmerald_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsIron_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsIron_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_black.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_black.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_brown.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_brown.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_cyan.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_cyan.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_gray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_gray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightblue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightblue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightgray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightgray.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lime.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lime.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_magenta.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_magenta.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_orange.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_orange.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_pink.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_pink.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_purple.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_purple.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_white.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_white.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsObsidian.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsObsidian.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsQuartz.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsSandstone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsStone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsVoid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsVoid.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsWood_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLens.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLens.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLensOverlay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLensOverlay.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterBottom.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterBottom.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterSide.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterSide.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterTop.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterTop.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerCobblestone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerDiamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerDiamond.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerEmerald_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerGold.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM128.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM128.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM16.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM16.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM2.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM2.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM32.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM32.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM4.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM4.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM64.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM64.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM8.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM8.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerQuartz.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerSandstone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerStone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerWood_standard.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStainedOverlay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStainedOverlay.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStripes.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStripes.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStructureCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStructureCobblestone.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/transparent_facade.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/transparent_facade.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png old mode 100644 new mode 100755 index ab8ecd7a..3ba58d17 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt.png new file mode 100755 index 00000000..0e0e3c5a Binary files /dev/null and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt2.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt2.png new file mode 100755 index 00000000..ca2ec17e Binary files /dev/null and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_alt2.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_cb.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_original.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_original.png new file mode 100755 index 00000000..6ea93571 Binary files /dev/null and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_original.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png old mode 100644 new mode 100755 index 87127743..ada3525f Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png old mode 100644 new mode 100755 index 52a89d1a..ee520d2b Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png old mode 100644 new mode 100755 index ccafe01f..4cbf50ac Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png old mode 100644 new mode 100755 index 53646a83..1d0ea9f7 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png old mode 100644 new mode 100755 index 7c1bd41c..b784688e Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png index 64db6656..427c5c3d 100755 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png old mode 100644 new mode 100755 index d731b311..651502bd Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png and b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emerald.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emzuli.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emzuli.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png old mode 100644 new mode 100755 index 21a34f2a..8f41b502 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png old mode 100644 new mode 100755 index 9345fff9..b80fa3e8 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png old mode 100644 new mode 100755 index 6ef0a295..c1896f27 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png old mode 100644 new mode 100755 index ff1118f3..b931de4b Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png old mode 100644 new mode 100755 index ffe50185..a6c17a7c Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png.mcmeta b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png.mcmeta new file mode 100755 index 00000000..7e77c648 --- /dev/null +++ b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png old mode 100644 new mode 100755 index 28dbed08..67943772 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png old mode 100644 new mode 100755 index 2aa9ee8a..e1913fa8 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png old mode 100644 new mode 100755 index a0af6ac7..5484f210 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png old mode 100644 new mode 100755 index 9000987c..ff4473e6 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png old mode 100644 new mode 100755 index 75a4ef37..eb313c5c Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png old mode 100644 new mode 100755 index f6c90fd0..39a78bcf Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png old mode 100644 new mode 100755 index a64138e0..abd94112 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png old mode 100644 new mode 100755 index 19a1a7f7..efedd6e0 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/filterFrame.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/filterFrame.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/lensFrame.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/lensFrame.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/transparent.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/transparent.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWaterproof.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWaterproof.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png old mode 100644 new mode 100755 index 722f7f7d..d8bb50b3 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png old mode 100644 new mode 100755 index d3920bdc..be506188 Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png old mode 100644 new mode 100755 index 602c2a8c..4b56d3cc Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png old mode 100644 new mode 100755 index 57a95454..34f88d2e Binary files a/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png and b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png differ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_pulsar.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_single_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_single_pulsar.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_closed.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_closed.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_input_only.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_input_only.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_open.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_open.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_output_only.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_output_only.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_blue.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_green.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_red.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_yellow.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/guitriggers_3_4.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/guitriggers_3_4.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_01.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_01.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_02.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_02.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_03.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_03.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_04.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_04.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_05.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_05.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_06.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_06.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_07.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_07.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_08.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_08.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_09.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_09.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_10.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_10.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_11.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_11.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_12.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_12.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_13.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_13.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_14.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_14.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_15.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_15.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m128.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m128.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m16.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m16.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m2.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m2.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m32.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m32.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m4.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m4.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m64.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m64.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m8.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m8.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsenergy.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsfluids.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsfluids.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsitems.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsitems.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_empty.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_empty.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_requestsenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_requestsenergy.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_toomuchenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_toomuchenergy.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_active.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_inactive.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_long.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_long.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_medium.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_medium.png old mode 100644 new mode 100755 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_short.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_short.png old mode 100644 new mode 100755 diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index f8acf044..22ea60f6 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -172,7 +172,7 @@ public class BuildCraftCore extends BuildCraftMod { @SideOnly(Side.CLIENT) public static IIconProvider iconProvider; public static int blockByEntityModel; - public static int multipassModel; + public static int complexBlockModel; public static int legacyPipeModel; public static int markerModel; public static ITriggerExternal triggerMachineActive = new TriggerMachine(true); diff --git a/common/buildcraft/core/lib/block/BlockBuildCraft.java b/common/buildcraft/core/lib/block/BlockBuildCraft.java index dbca662a..614dcd39 100644 --- a/common/buildcraft/core/lib/block/BlockBuildCraft.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraft.java @@ -212,7 +212,7 @@ public abstract class BlockBuildCraft extends BlockContainer { return getIconAbsolute(side, metadata & 8); } - int front = metadata >= 2 && metadata <= 5 ? metadata : 3; + int front = getFrontSide(metadata); return getIconAbsolute(SIDE_TEXTURING_LOCATIONS[(front - 2) % 4][(side - 2) % 4], metadata & 8); } else { return getIconAbsolute(side, metadata); @@ -257,8 +257,7 @@ public abstract class BlockBuildCraft extends BlockContainer { } } - @Override - public boolean canRenderInPass(int pass) { + public boolean canRenderInPassBC(int pass) { if (pass >= maxPasses) { renderPass = 0; return false; @@ -268,14 +267,14 @@ public abstract class BlockBuildCraft extends BlockContainer { } } - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return maxPasses > 1 ? 1 : 0; - } + //@SideOnly(Side.CLIENT) + //public int getRenderBlockPass() { + // return maxPasses > 1 ? 1 : 0; + //} @Override public int getRenderType() { - return maxPasses > 1 ? BuildCraftCore.multipassModel : 0; + return (maxPasses > 1 || isRotatable()) ? BuildCraftCore.complexBlockModel : 0; } public int getCurrentRenderPass() { @@ -289,4 +288,11 @@ public abstract class BlockBuildCraft extends BlockContainer { public int getIconGlowLevel(IBlockAccess access, int x, int y, int z) { return getIconGlowLevel(); } + + public int getFrontSide(int meta) { + if (!isRotatable()) { + return -1; + } + return meta >= 2 && meta <= 5 ? meta : 3; + } } diff --git a/common/buildcraft/core/lib/render/RenderBlockMultipass.java b/common/buildcraft/core/lib/render/RenderBlockComplex.java similarity index 55% rename from common/buildcraft/core/lib/render/RenderBlockMultipass.java rename to common/buildcraft/core/lib/render/RenderBlockComplex.java index bcf6609b..f3e17680 100644 --- a/common/buildcraft/core/lib/render/RenderBlockMultipass.java +++ b/common/buildcraft/core/lib/render/RenderBlockComplex.java @@ -9,59 +9,85 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import buildcraft.BuildCraftCore; import buildcraft.core.lib.block.BlockBuildCraft; -public class RenderBlockMultipass implements ISimpleBlockRenderingHandler { +public class RenderBlockComplex implements ISimpleBlockRenderingHandler { + private static final int[] Y_ROTATE = {3, 0, 1, 2}; + @Override public void renderInventoryBlock(Block block, int meta, int modelId, RenderBlocks renderer) { BlockBuildCraft bcBlock = (BlockBuildCraft) block; int pass = 0; - while (bcBlock.canRenderInPass(pass)) { + while (bcBlock.canRenderInPassBC(pass)) { renderPassInventory(pass, bcBlock, meta, renderer); pass++; } } private void renderPassInventory(int pass, BlockBuildCraft block, int meta, RenderBlocks renderer) { + if (block.isRotatable()) { + renderer.uvRotateTop = Y_ROTATE[block.getFrontSide(meta) - 2]; + renderer.uvRotateBottom = Y_ROTATE[block.getFrontSide(meta) - 2]; + } + if (block.getIconGlowLevel() >= 0) { Tessellator.instance.setBrightness(block.getIconGlowLevel() << 4); RenderUtils.drawBlockItem(renderer, Tessellator.instance, block, meta); } else { RenderUtils.drawBlockItem(renderer, Tessellator.instance, block, meta); } + + renderer.uvRotateTop = 0; + renderer.uvRotateBottom = 0; } private void renderPassWorld(int pass, BlockBuildCraft block, int meta, RenderBlocks renderer, IBlockAccess world, int x, int y, int z) { + if (block.isRotatable()) { + renderer.uvRotateTop = Y_ROTATE[block.getFrontSide(meta) - 2]; + renderer.uvRotateBottom = Y_ROTATE[block.getFrontSide(meta) - 2]; + } + + double pDouble = ((pass > 0 ? 1 : 0) / 512.0); + renderer.setRenderBounds(block.getBlockBoundsMinX() - pDouble, + block.getBlockBoundsMinY() - pDouble, + block.getBlockBoundsMinZ() - pDouble, + block.getBlockBoundsMaxX() + pDouble, + block.getBlockBoundsMaxY() + pDouble, + block.getBlockBoundsMaxZ() + pDouble); + if (block.getIconGlowLevel(world, x, y, z) >= 0) { Tessellator.instance.setBrightness(block.getIconGlowLevel(world, x, y, z) << 4); Tessellator.instance.setColorOpaque_F(1.0F, 1.0F, 1.0F); IIcon icon; icon = block.getIcon(world, x, y, z, 0); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y - 1, z, 0))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y - 1, z, 0))) { renderer.renderFaceYNeg(block, x, y, z, icon); } icon = block.getIcon(world, x, y, z, 1); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y + 1, z, 1))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y + 1, z, 1))) { renderer.renderFaceYPos(block, x, y, z, icon); } icon = block.getIcon(world, x, y, z, 2); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y, z - 1, 2))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y, z - 1, 2))) { renderer.renderFaceZNeg(block, x, y, z, icon); } icon = block.getIcon(world, x, y, z, 3); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y, z + 1, 3))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x, y, z + 1, 3))) { renderer.renderFaceZPos(block, x, y, z, icon); } icon = block.getIcon(world, x, y, z, 4); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x - 1, y, z, 4))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x - 1, y, z, 4))) { renderer.renderFaceXNeg(block, x, y, z, icon); } icon = block.getIcon(world, x, y, z, 5); - if (icon != null && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x + 1, y, z, 5))) { + if (icon != BuildCraftCore.transparentTexture && (renderer.renderAllFaces || block.shouldSideBeRendered(world, x + 1, y, z, 5))) { renderer.renderFaceXPos(block, x, y, z, icon); } } else { renderer.renderStandardBlockWithColorMultiplier(block, x, y, z, 1.0f, 1.0f, 1.0f); } + + renderer.uvRotateTop = 0; + renderer.uvRotateBottom = 0; } @Override @@ -69,16 +95,10 @@ public class RenderBlockMultipass implements ISimpleBlockRenderingHandler { BlockBuildCraft bcBlock = (BlockBuildCraft) block; int meta = world.getBlockMetadata(x, y, z); - if (bcBlock.getCurrentRenderPass() > 0) { - int pass = bcBlock.getCurrentRenderPass(); - while (bcBlock.canRenderInPass(pass)) { - renderPassWorld(pass, bcBlock, meta, renderer, world, x, y, z); - pass++; - } - } else { - if (bcBlock.canRenderInPass(0)) { - renderPassWorld(0, bcBlock, meta, renderer, world, x, y, z); - } + int pass = bcBlock.getCurrentRenderPass(); + while (bcBlock.canRenderInPassBC(pass)) { + renderPassWorld(pass, bcBlock, meta, renderer, world, x, y, z); + pass++; } return true; } @@ -90,6 +110,6 @@ public class RenderBlockMultipass implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return BuildCraftCore.multipassModel; + return BuildCraftCore.complexBlockModel; } } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 9341b7f4..dc320169 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -27,12 +27,11 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import buildcraft.BuildCraftCore; -import buildcraft.core.TileEngine; import buildcraft.core.lib.EntityBlock; import buildcraft.core.LaserKind; import buildcraft.core.lib.engines.RenderEngine; import buildcraft.core.lib.engines.TileEngineBase; -import buildcraft.core.lib.render.RenderBlockMultipass; +import buildcraft.core.lib.render.RenderBlockComplex; import buildcraft.core.lib.render.RenderEntityBlock; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingMarkers; @@ -85,12 +84,12 @@ public class CoreProxyClient extends CoreProxy { BuildCraftCore.blockByEntityModel = RenderingRegistry.getNextAvailableRenderId(); BuildCraftCore.legacyPipeModel = RenderingRegistry.getNextAvailableRenderId(); BuildCraftCore.markerModel = RenderingRegistry.getNextAvailableRenderId(); - BuildCraftCore.multipassModel = RenderingRegistry.getNextAvailableRenderId(); + BuildCraftCore.complexBlockModel = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new RenderingEntityBlocks()); RenderingRegistry.registerBlockHandler(BuildCraftCore.legacyPipeModel, new RenderingEntityBlocks()); RenderingRegistry.registerBlockHandler(new RenderingMarkers()); - RenderingRegistry.registerBlockHandler(BuildCraftCore.multipassModel, new RenderBlockMultipass()); + RenderingRegistry.registerBlockHandler(BuildCraftCore.complexBlockModel, new RenderBlockComplex()); //TODO Update me to grab differing trunk textures ClientRegistry.bindTileEntitySpecialRenderer(TileEngineBase.class, new RenderEngine()); diff --git a/common/buildcraft/robotics/BlockRequester.java b/common/buildcraft/robotics/BlockRequester.java index ad1dedaa..ec1b9e2e 100755 --- a/common/buildcraft/robotics/BlockRequester.java +++ b/common/buildcraft/robotics/BlockRequester.java @@ -32,6 +32,7 @@ import buildcraft.core.lib.utils.Utils; public class BlockRequester extends BlockBuildCraft { public BlockRequester() { super(Material.iron); + setRotatable(true); } @Override diff --git a/common/buildcraft/robotics/BlockZonePlan.java b/common/buildcraft/robotics/BlockZonePlan.java index 4fe33c61..964465e6 100755 --- a/common/buildcraft/robotics/BlockZonePlan.java +++ b/common/buildcraft/robotics/BlockZonePlan.java @@ -32,6 +32,7 @@ import buildcraft.core.lib.utils.Utils; public class BlockZonePlan extends BlockBuildCraft { public BlockZonePlan() { super(Material.iron); + setRotatable(true); } @Override diff --git a/common/buildcraft/silicon/SiliconProxyClient.java b/common/buildcraft/silicon/SiliconProxyClient.java index 598b93e9..631cb7b5 100644 --- a/common/buildcraft/silicon/SiliconProxyClient.java +++ b/common/buildcraft/silicon/SiliconProxyClient.java @@ -10,15 +10,15 @@ package buildcraft.silicon; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import buildcraft.silicon.render.RenderLaserBlock; +import buildcraft.silicon.render.RenderLaserTile; public class SiliconProxyClient extends SiliconProxy { @Override public void registerRenderers() { SiliconProxy.laserBlockModel = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new SiliconRenderBlock()); + RenderingRegistry.registerBlockHandler(new RenderLaserBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileLaser.class, new RenderLaserBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileLaser.class, new RenderLaserTile()); } } diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java deleted file mode 100644 index fa3cb749..00000000 --- a/common/buildcraft/silicon/SiliconRenderBlock.java +++ /dev/null @@ -1,161 +0,0 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.silicon; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.core.CoreConstants; - -public class SiliconRenderBlock implements ISimpleBlockRenderingHandler { - @Override - public int getRenderId() { - return SiliconProxy.laserBlockModel; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public boolean renderWorldBlock(IBlockAccess iblockaccess, int x, int y, int z, Block block, int l, RenderBlocks renderblocks) { - - int meta = iblockaccess.getBlockMetadata(x, y, z); - - if (meta == ForgeDirection.EAST.ordinal()) { - renderblocks.uvRotateEast = 2; - renderblocks.uvRotateWest = 1; - renderblocks.uvRotateTop = 1; - renderblocks.uvRotateBottom = 2; - - renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 4F / 16F, 1, 1); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(4F / 16F, 5F / 16F, 5F / 16F, 13F / 16F, 11F / 16F, 11F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } else if (meta == ForgeDirection.WEST.ordinal()) { - renderblocks.uvRotateEast = 1; - renderblocks.uvRotateWest = 2; - renderblocks.uvRotateTop = 2; - renderblocks.uvRotateBottom = 1; - - renderblocks.setRenderBounds(1F - 4F / 16F, 0.0F, 0.0F, 1, 1, 1); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(1F - 13F / 16F, 5F / 16F, 5F / 16F, 1F - 4F / 16F, 11F / 16F, 11F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } else if (meta == ForgeDirection.NORTH.ordinal()) { - renderblocks.uvRotateSouth = 1; - renderblocks.uvRotateNorth = 2; - - renderblocks.setRenderBounds(0.0F, 0.0F, 1F - 4F / 16F, 1, 1, 1); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(5F / 16F, 5F / 16F, 1F - 13F / 16F, 11F / 16F, 11F / 16F, 1F - 4F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } else if (meta == ForgeDirection.SOUTH.ordinal()) { - renderblocks.uvRotateSouth = 2; - renderblocks.uvRotateNorth = 1; - renderblocks.uvRotateTop = 3; - renderblocks.uvRotateBottom = 3; - - renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1, 1, 4F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(5F / 16F, 5F / 16F, 4F / 16F, 11F / 16F, 11F / 16F, 13F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } else if (meta == ForgeDirection.DOWN.ordinal()) { - renderblocks.uvRotateEast = 3; - renderblocks.uvRotateWest = 3; - renderblocks.uvRotateSouth = 3; - renderblocks.uvRotateNorth = 3; - - renderblocks.setRenderBounds(0.0F, 1.0F - 4F / 16F, 0.0F, 1.0F, 1.0F, 1.0F); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(5F / 16F, 1F - 13F / 16F, 5F / 16F, 11F / 16F, 1F - 4F / 16F, 11F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } else if (meta == ForgeDirection.UP.ordinal()) { - renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1, 0.25, 1); - renderblocks.renderStandardBlock(block, x, y, z); - - renderblocks.setRenderBounds(5F / 16F, 4F / 16F, 5F / 16F, 11F / 16F, 13F / 16F, 11F / 16F); - renderblocks.renderStandardBlock(block, x, y, z); - } - - renderblocks.uvRotateEast = 0; - renderblocks.uvRotateWest = 0; - renderblocks.uvRotateSouth = 0; - renderblocks.uvRotateNorth = 0; - renderblocks.uvRotateTop = 0; - renderblocks.uvRotateBottom = 0; - - return true; - - } - - @Override - public void renderInventoryBlock(Block block, int i, int j, RenderBlocks renderblocks) { - block.setBlockBounds(CoreConstants.PIPE_MIN_POS, 0.0F, CoreConstants.PIPE_MIN_POS, CoreConstants.PIPE_MAX_POS, 1.0F, CoreConstants.PIPE_MAX_POS); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1, 4F / 16F, 1); - renderblocks.setRenderBoundsFromBlock(block); - renderBlockInInv(renderblocks, block, 0); - - block.setBlockBounds(5F / 16F, 4F / 16F, 5F / 16F, 11F / 16F, 13F / 16F, 11F / 16F); - renderblocks.setRenderBoundsFromBlock(block); - renderBlockInInv(renderblocks, block, 1); - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - private void renderBlockInInv(RenderBlocks renderblocks, Block block, int i) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, i)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, i)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, i)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, i)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, i)); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, i)); - tessellator.draw(); - } -} diff --git a/common/buildcraft/silicon/render/RenderLaserBlock.java b/common/buildcraft/silicon/render/RenderLaserBlock.java old mode 100755 new mode 100644 index f590c465..3006f9e2 --- a/common/buildcraft/silicon/render/RenderLaserBlock.java +++ b/common/buildcraft/silicon/render/RenderLaserBlock.java @@ -10,29 +10,153 @@ package buildcraft.silicon.render; import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; -import buildcraft.core.render.RenderLaser; -import buildcraft.silicon.TileLaser; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -public class RenderLaserBlock extends TileEntitySpecialRenderer { +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.core.CoreConstants; +import buildcraft.silicon.SiliconProxy; + +public class RenderLaserBlock implements ISimpleBlockRenderingHandler { + @Override + public int getRenderId() { + return SiliconProxy.laserBlockModel; + } @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - TileLaser laser = (TileLaser) tileentity; + public boolean shouldRender3DInInventory(int modelId) { + return true; + } - if (laser != null) { - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - GL11.glTranslated(-tileentity.xCoord, -tileentity.yCoord, -tileentity.zCoord); + @Override + public boolean renderWorldBlock(IBlockAccess iblockaccess, int x, int y, int z, Block block, int l, RenderBlocks renderblocks) { - GL11.glPushMatrix(); - RenderLaser.doRenderLaser(TileEntityRendererDispatcher.instance.field_147553_e, laser.laser, laser.getTexture()); - GL11.glPopMatrix(); - - GL11.glPopMatrix(); + int meta = iblockaccess.getBlockMetadata(x, y, z); + + if (meta == ForgeDirection.EAST.ordinal()) { + renderblocks.uvRotateEast = 2; + renderblocks.uvRotateWest = 1; + renderblocks.uvRotateTop = 1; + renderblocks.uvRotateBottom = 2; + + renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 4F / 16F, 1, 1); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(4F / 16F, 5F / 16F, 5F / 16F, 13F / 16F, 11F / 16F, 11F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + } else if (meta == ForgeDirection.WEST.ordinal()) { + renderblocks.uvRotateEast = 1; + renderblocks.uvRotateWest = 2; + renderblocks.uvRotateTop = 2; + renderblocks.uvRotateBottom = 1; + + renderblocks.setRenderBounds(1F - 4F / 16F, 0.0F, 0.0F, 1, 1, 1); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(1F - 13F / 16F, 5F / 16F, 5F / 16F, 1F - 4F / 16F, 11F / 16F, 11F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + } else if (meta == ForgeDirection.NORTH.ordinal()) { + renderblocks.uvRotateSouth = 1; + renderblocks.uvRotateNorth = 2; + + renderblocks.setRenderBounds(0.0F, 0.0F, 1F - 4F / 16F, 1, 1, 1); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(5F / 16F, 5F / 16F, 1F - 13F / 16F, 11F / 16F, 11F / 16F, 1F - 4F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + } else if (meta == ForgeDirection.SOUTH.ordinal()) { + renderblocks.uvRotateSouth = 2; + renderblocks.uvRotateNorth = 1; + renderblocks.uvRotateTop = 3; + renderblocks.uvRotateBottom = 3; + + renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1, 1, 4F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(5F / 16F, 5F / 16F, 4F / 16F, 11F / 16F, 11F / 16F, 13F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + } else if (meta == ForgeDirection.DOWN.ordinal()) { + renderblocks.uvRotateEast = 3; + renderblocks.uvRotateWest = 3; + renderblocks.uvRotateSouth = 3; + renderblocks.uvRotateNorth = 3; + + renderblocks.setRenderBounds(0.0F, 1.0F - 4F / 16F, 0.0F, 1.0F, 1.0F, 1.0F); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(5F / 16F, 1F - 13F / 16F, 5F / 16F, 11F / 16F, 1F - 4F / 16F, 11F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); + } else if (meta == ForgeDirection.UP.ordinal()) { + renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1, 0.25, 1); + renderblocks.renderStandardBlock(block, x, y, z); + + renderblocks.setRenderBounds(5F / 16F, 4F / 16F, 5F / 16F, 11F / 16F, 13F / 16F, 11F / 16F); + renderblocks.renderStandardBlock(block, x, y, z); } + + renderblocks.uvRotateEast = 0; + renderblocks.uvRotateWest = 0; + renderblocks.uvRotateSouth = 0; + renderblocks.uvRotateNorth = 0; + renderblocks.uvRotateTop = 0; + renderblocks.uvRotateBottom = 0; + + return true; + + } + + @Override + public void renderInventoryBlock(Block block, int i, int j, RenderBlocks renderblocks) { + block.setBlockBounds(CoreConstants.PIPE_MIN_POS, 0.0F, CoreConstants.PIPE_MIN_POS, CoreConstants.PIPE_MAX_POS, 1.0F, CoreConstants.PIPE_MAX_POS); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1, 4F / 16F, 1); + renderblocks.setRenderBoundsFromBlock(block); + renderBlockInInv(renderblocks, block, 0); + + block.setBlockBounds(5F / 16F, 4F / 16F, 5F / 16F, 11F / 16F, 13F / 16F, 11F / 16F); + renderblocks.setRenderBoundsFromBlock(block); + renderBlockInInv(renderblocks, block, 1); + + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + private void renderBlockInInv(RenderBlocks renderblocks, Block block, int i) { + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, i)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, i)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, i)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, i)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, i)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, i)); + tessellator.draw(); } } diff --git a/common/buildcraft/silicon/render/RenderLaserTile.java b/common/buildcraft/silicon/render/RenderLaserTile.java new file mode 100755 index 00000000..5cb773ff --- /dev/null +++ b/common/buildcraft/silicon/render/RenderLaserTile.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.silicon.render; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import buildcraft.core.render.RenderLaser; +import buildcraft.silicon.TileLaser; + +public class RenderLaserTile extends TileEntitySpecialRenderer { + + @Override + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { + TileLaser laser = (TileLaser) tileentity; + + if (laser != null) { + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + GL11.glTranslated(-tileentity.xCoord, -tileentity.yCoord, -tileentity.zCoord); + + GL11.glPushMatrix(); + RenderLaser.doRenderLaser(TileEntityRendererDispatcher.instance.field_147553_e, laser.laser, laser.getTexture()); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + } + } +}