diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFront.png b/resources/assets/enderio/textures/blocks/alloySmelterFront.png index d73298fd..b57c27c1 100644 Binary files a/resources/assets/enderio/textures/blocks/alloySmelterFront.png and b/resources/assets/enderio/textures/blocks/alloySmelterFront.png differ diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png b/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png index a42ba1d9..767bab96 100644 Binary files a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png and b/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/blockAttractorSide.png b/resources/assets/enderio/textures/blocks/blockAttractorSide.png index 2dd7c8bb..d290efd0 100644 Binary files a/resources/assets/enderio/textures/blocks/blockAttractorSide.png and b/resources/assets/enderio/textures/blocks/blockAttractorSide.png differ diff --git a/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png b/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png index c5227ea1..4c20bf4b 100644 Binary files a/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png and b/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferCreative.png b/resources/assets/enderio/textures/blocks/blockBufferCreative.png index 687230ab..8939de98 100644 Binary files a/resources/assets/enderio/textures/blocks/blockBufferCreative.png and b/resources/assets/enderio/textures/blocks/blockBufferCreative.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferItem.png b/resources/assets/enderio/textures/blocks/blockBufferItem.png index a02ca3b5..427e236d 100644 Binary files a/resources/assets/enderio/textures/blocks/blockBufferItem.png and b/resources/assets/enderio/textures/blocks/blockBufferItem.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferOmni.png b/resources/assets/enderio/textures/blocks/blockBufferOmni.png index abb1cbbc..7ec61e63 100644 Binary files a/resources/assets/enderio/textures/blocks/blockBufferOmni.png and b/resources/assets/enderio/textures/blocks/blockBufferOmni.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferPower.png b/resources/assets/enderio/textures/blocks/blockBufferPower.png index dbb0ce3a..cab30c6f 100644 Binary files a/resources/assets/enderio/textures/blocks/blockBufferPower.png and b/resources/assets/enderio/textures/blocks/blockBufferPower.png differ diff --git a/resources/assets/enderio/textures/blocks/blockElectricLightFace.png b/resources/assets/enderio/textures/blocks/blockElectricLightFace.png index 6c7e4dda..b4a120e6 100644 Binary files a/resources/assets/enderio/textures/blocks/blockElectricLightFace.png and b/resources/assets/enderio/textures/blocks/blockElectricLightFace.png differ diff --git a/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png b/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png index 18bcfab5..6097abbc 100644 Binary files a/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png and b/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png differ diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png b/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png index 91abf4a6..7df9a3cb 100644 Binary files a/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png and b/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png differ diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png b/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png index 049a1a3b..62384093 100644 Binary files a/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png and b/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png differ diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png b/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png index e021369b..154c53d3 100644 Binary files a/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png and b/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png differ diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png b/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png index b54518c8..4e36d6ff 100644 Binary files a/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png and b/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png differ diff --git a/resources/assets/enderio/textures/blocks/blockTravelAnchor.png b/resources/assets/enderio/textures/blocks/blockTravelAnchor.png index 2fe475f2..ff08811f 100644 Binary files a/resources/assets/enderio/textures/blocks/blockTravelAnchor.png and b/resources/assets/enderio/textures/blocks/blockTravelAnchor.png differ diff --git a/resources/assets/enderio/textures/blocks/blockVacuumChest.png b/resources/assets/enderio/textures/blocks/blockVacuumChest.png index c84b2568..4ae85b7b 100644 Binary files a/resources/assets/enderio/textures/blocks/blockVacuumChest.png and b/resources/assets/enderio/textures/blocks/blockVacuumChest.png differ diff --git a/resources/assets/enderio/textures/blocks/blockWirelessCharger.png b/resources/assets/enderio/textures/blocks/blockWirelessCharger.png index 2c1981fd..8e55e67d 100644 Binary files a/resources/assets/enderio/textures/blocks/blockWirelessCharger.png and b/resources/assets/enderio/textures/blocks/blockWirelessCharger.png differ diff --git a/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png b/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png index dd2c81fc..103e722a 100644 Binary files a/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png and b/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png differ diff --git a/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png b/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png index 0112c2a4..c3549cda 100644 Binary files a/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png and b/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png differ diff --git a/resources/assets/enderio/textures/blocks/capBankInfoPanel.png b/resources/assets/enderio/textures/blocks/capBankInfoPanel.png index 31918aa3..e5e19cbe 100644 Binary files a/resources/assets/enderio/textures/blocks/capBankInfoPanel.png and b/resources/assets/enderio/textures/blocks/capBankInfoPanel.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBank.png b/resources/assets/enderio/textures/blocks/capacitorBank.png index 4d505554..cb1f1159 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBank.png and b/resources/assets/enderio/textures/blocks/capacitorBank.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png index a6b17c20..4c20edd1 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png and b/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png index 3a86d844..926a5e98 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png and b/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png b/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png index abdfbad9..e5718d04 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png and b/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankInput.png b/resources/assets/enderio/textures/blocks/capacitorBankInput.png index 20ea99bb..d8b33ff1 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankInput.png and b/resources/assets/enderio/textures/blocks/capacitorBankInput.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankLocked.png b/resources/assets/enderio/textures/blocks/capacitorBankLocked.png index 34a942e6..12e6569b 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankLocked.png and b/resources/assets/enderio/textures/blocks/capacitorBankLocked.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankOutput.png b/resources/assets/enderio/textures/blocks/capacitorBankOutput.png index 9956dd8f..48713af6 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankOutput.png and b/resources/assets/enderio/textures/blocks/capacitorBankOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png b/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png index 2c3c0365..597005c3 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png and b/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png index 780659c4..9911f14d 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png and b/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png index e83ca6b3..ab8f734c 100644 Binary files a/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png and b/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/crafter.png b/resources/assets/enderio/textures/blocks/crafter.png index f24a7aca..85ba350e 100644 Binary files a/resources/assets/enderio/textures/blocks/crafter.png and b/resources/assets/enderio/textures/blocks/crafter.png differ diff --git a/resources/assets/enderio/textures/blocks/crafterSide.png b/resources/assets/enderio/textures/blocks/crafterSide.png index 0723e1da..b631c889 100644 Binary files a/resources/assets/enderio/textures/blocks/crafterSide.png and b/resources/assets/enderio/textures/blocks/crafterSide.png differ diff --git a/resources/assets/enderio/textures/blocks/crafterTop.png b/resources/assets/enderio/textures/blocks/crafterTop.png index 1ca48c91..6dea4d12 100644 Binary files a/resources/assets/enderio/textures/blocks/crafterTop.png and b/resources/assets/enderio/textures/blocks/crafterTop.png differ diff --git a/resources/assets/enderio/textures/blocks/crusherFront.png b/resources/assets/enderio/textures/blocks/crusherFront.png index 4d553060..c931ed14 100644 Binary files a/resources/assets/enderio/textures/blocks/crusherFront.png and b/resources/assets/enderio/textures/blocks/crusherFront.png differ diff --git a/resources/assets/enderio/textures/blocks/crusherFrontOn.png b/resources/assets/enderio/textures/blocks/crusherFrontOn.png index 87ba4e54..bc9466f6 100644 Binary files a/resources/assets/enderio/textures/blocks/crusherFrontOn.png and b/resources/assets/enderio/textures/blocks/crusherFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png b/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png index 42936ace..555a0759 100644 Binary files a/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png and b/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png differ diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png b/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png index 1e77e7f8..10e7e82a 100644 Binary files a/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png and b/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png differ diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png b/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png index de138256..000cf4d2 100644 Binary files a/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png and b/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png differ diff --git a/resources/assets/enderio/textures/blocks/machineBack.png b/resources/assets/enderio/textures/blocks/machineBack.png index 2e68b14a..1fe75196 100644 Binary files a/resources/assets/enderio/textures/blocks/machineBack.png and b/resources/assets/enderio/textures/blocks/machineBack.png differ diff --git a/resources/assets/enderio/textures/blocks/machineSide.png b/resources/assets/enderio/textures/blocks/machineSide.png index 5b1a85df..2ce9652a 100644 Binary files a/resources/assets/enderio/textures/blocks/machineSide.png and b/resources/assets/enderio/textures/blocks/machineSide.png differ diff --git a/resources/assets/enderio/textures/blocks/machineTemplate.png b/resources/assets/enderio/textures/blocks/machineTemplate.png index f9b9559c..d7b08042 100644 Binary files a/resources/assets/enderio/textures/blocks/machineTemplate.png and b/resources/assets/enderio/textures/blocks/machineTemplate.png differ diff --git a/resources/assets/enderio/textures/blocks/machineTop.png b/resources/assets/enderio/textures/blocks/machineTop.png index de519d59..559e8172 100644 Binary files a/resources/assets/enderio/textures/blocks/machineTop.png and b/resources/assets/enderio/textures/blocks/machineTop.png differ diff --git a/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png b/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png new file mode 100644 index 00000000..d73298fd Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png differ diff --git a/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png b/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png new file mode 100644 index 00000000..a42ba1d9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png b/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png new file mode 100644 index 00000000..2dd7c8bb Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png b/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png new file mode 100644 index 00000000..c5227ea1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png b/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png new file mode 100644 index 00000000..687230ab Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferItem.png b/resources/assets/enderio/textures/blocks/old/blockBufferItem.png new file mode 100644 index 00000000..a02ca3b5 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockBufferItem.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png b/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png new file mode 100644 index 00000000..abb1cbbc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferPower.png b/resources/assets/enderio/textures/blocks/old/blockBufferPower.png new file mode 100644 index 00000000..dbb0ce3a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockBufferPower.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png b/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png new file mode 100644 index 00000000..6c7e4dda Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png b/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png new file mode 100644 index 00000000..18bcfab5 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png b/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png new file mode 100644 index 00000000..91abf4a6 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png b/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png new file mode 100644 index 00000000..049a1a3b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png b/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png new file mode 100644 index 00000000..e021369b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png b/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png new file mode 100644 index 00000000..b54518c8 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png b/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png new file mode 100644 index 00000000..2fe475f2 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta b/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png b/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png new file mode 100644 index 00000000..c84b2568 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png b/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png new file mode 100644 index 00000000..2c1981fd Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png b/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png new file mode 100644 index 00000000..dd2c81fc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png b/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png new file mode 100644 index 00000000..0112c2a4 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png b/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png new file mode 100644 index 00000000..31918aa3 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBank.png b/resources/assets/enderio/textures/blocks/old/capacitorBank.png new file mode 100644 index 00000000..4d505554 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBank.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png b/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png new file mode 100644 index 00000000..a6b17c20 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png b/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png new file mode 100644 index 00000000..3a86d844 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png b/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png new file mode 100644 index 00000000..abdfbad9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png b/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png new file mode 100644 index 00000000..20ea99bb Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png b/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png new file mode 100644 index 00000000..34a942e6 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png b/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png new file mode 100644 index 00000000..9956dd8f Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png b/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png new file mode 100644 index 00000000..2c3c0365 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png b/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png new file mode 100644 index 00000000..2c1981fd Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png b/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png new file mode 100644 index 00000000..780659c4 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png b/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png new file mode 100644 index 00000000..e83ca6b3 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png differ diff --git a/resources/assets/enderio/textures/blocks/combustionGenFront.png b/resources/assets/enderio/textures/blocks/old/combustionGenFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/combustionGenFront.png rename to resources/assets/enderio/textures/blocks/old/combustionGenFront.png diff --git a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png b/resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/combustionGenFrontOn.png rename to resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/crafter.png b/resources/assets/enderio/textures/blocks/old/crafter.png new file mode 100644 index 00000000..f24a7aca Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/crafter.png differ diff --git a/resources/assets/enderio/textures/blocks/old/crafterSide.png b/resources/assets/enderio/textures/blocks/old/crafterSide.png new file mode 100644 index 00000000..0723e1da Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/crafterSide.png differ diff --git a/resources/assets/enderio/textures/blocks/old/crafterTop.png b/resources/assets/enderio/textures/blocks/old/crafterTop.png new file mode 100644 index 00000000..1ca48c91 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/crafterTop.png differ diff --git a/resources/assets/enderio/textures/blocks/old/crusherFront.png b/resources/assets/enderio/textures/blocks/old/crusherFront.png new file mode 100644 index 00000000..4d553060 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/crusherFront.png differ diff --git a/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png b/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png new file mode 100644 index 00000000..87ba4e54 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png new file mode 100644 index 00000000..42936ace Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png new file mode 100644 index 00000000..1e77e7f8 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png new file mode 100644 index 00000000..de138256 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png differ diff --git a/resources/assets/enderio/textures/blocks/old/machineBack.png b/resources/assets/enderio/textures/blocks/old/machineBack.png new file mode 100644 index 00000000..2e68b14a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/machineBack.png differ diff --git a/resources/assets/enderio/textures/blocks/old/machineSide.png b/resources/assets/enderio/textures/blocks/old/machineSide.png new file mode 100644 index 00000000..5b1a85df Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/machineSide.png differ diff --git a/resources/assets/enderio/textures/blocks/old/machineTemplate.png b/resources/assets/enderio/textures/blocks/old/machineTemplate.png new file mode 100644 index 00000000..f9b9559c Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/machineTemplate.png differ diff --git a/resources/assets/enderio/textures/blocks/old/machineTop.png b/resources/assets/enderio/textures/blocks/old/machineTop.png new file mode 100644 index 00000000..de519d59 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/machineTop.png differ diff --git a/resources/assets/enderio/textures/blocks/old/painterFrontOff.png b/resources/assets/enderio/textures/blocks/old/painterFrontOff.png new file mode 100644 index 00000000..a601302b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/painterFrontOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/painterFrontOn.png b/resources/assets/enderio/textures/blocks/old/painterFrontOn.png new file mode 100644 index 00000000..2ea411f9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/painterFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerMonitor.png b/resources/assets/enderio/textures/blocks/old/powerMonitor.png new file mode 100644 index 00000000..3fad0cfc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerMonitor.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoir.png b/resources/assets/enderio/textures/blocks/old/reservoir.png new file mode 100644 index 00000000..4bdbd485 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoir.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbB.png b/resources/assets/enderio/textures/blocks/old/reservoirMbB.png new file mode 100644 index 00000000..a0b4f933 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbB.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png b/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png new file mode 100644 index 00000000..0b66111c Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png b/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png new file mode 100644 index 00000000..b4673a70 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbL.png b/resources/assets/enderio/textures/blocks/old/reservoirMbL.png new file mode 100644 index 00000000..17e486ae Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbL.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbR.png b/resources/assets/enderio/textures/blocks/old/reservoirMbR.png new file mode 100644 index 00000000..850d02c8 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbR.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbT.png b/resources/assets/enderio/textures/blocks/old/reservoirMbT.png new file mode 100644 index 00000000..e060d808 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbT.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png b/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png new file mode 100644 index 00000000..a159821a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png b/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png new file mode 100644 index 00000000..53f39cac Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png differ diff --git a/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png b/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png new file mode 100644 index 00000000..135dcad6 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png differ diff --git a/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png b/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png new file mode 100644 index 00000000..3c56b415 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png differ diff --git a/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png b/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png new file mode 100644 index 00000000..b734a486 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta b/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta rename to resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png b/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png new file mode 100644 index 00000000..7197b8a9 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png b/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png new file mode 100644 index 00000000..0ecb2e0b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/stirlingGenSide.png b/resources/assets/enderio/textures/blocks/old/stirlingGenSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/stirlingGenSide.png rename to resources/assets/enderio/textures/blocks/old/stirlingGenSide.png diff --git a/resources/assets/enderio/textures/blocks/vatFront.png b/resources/assets/enderio/textures/blocks/old/vatFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatFront.png rename to resources/assets/enderio/textures/blocks/old/vatFront.png diff --git a/resources/assets/enderio/textures/blocks/vatFrontOn.png b/resources/assets/enderio/textures/blocks/old/vatFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatFrontOn.png rename to resources/assets/enderio/textures/blocks/old/vatFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/vatFrontOnSingle.png b/resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatFrontOnSingle.png rename to resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png diff --git a/resources/assets/enderio/textures/blocks/vatFrontSingle.png b/resources/assets/enderio/textures/blocks/old/vatFrontSingle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatFrontSingle.png rename to resources/assets/enderio/textures/blocks/old/vatFrontSingle.png diff --git a/resources/assets/enderio/textures/blocks/vatTop.png b/resources/assets/enderio/textures/blocks/old/vatTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatTop.png rename to resources/assets/enderio/textures/blocks/old/vatTop.png diff --git a/resources/assets/enderio/textures/blocks/painterFrontOff.png b/resources/assets/enderio/textures/blocks/painterFrontOff.png index a601302b..e76c60a7 100644 Binary files a/resources/assets/enderio/textures/blocks/painterFrontOff.png and b/resources/assets/enderio/textures/blocks/painterFrontOff.png differ diff --git a/resources/assets/enderio/textures/blocks/painterFrontOn.png b/resources/assets/enderio/textures/blocks/painterFrontOn.png index 2ea411f9..85200a53 100644 Binary files a/resources/assets/enderio/textures/blocks/painterFrontOn.png and b/resources/assets/enderio/textures/blocks/painterFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/powerMonitor.png b/resources/assets/enderio/textures/blocks/powerMonitor.png index 3fad0cfc..08b093c1 100644 Binary files a/resources/assets/enderio/textures/blocks/powerMonitor.png and b/resources/assets/enderio/textures/blocks/powerMonitor.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoir.png b/resources/assets/enderio/textures/blocks/reservoir.png index 4bdbd485..5cf3561f 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoir.png and b/resources/assets/enderio/textures/blocks/reservoir.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbB.png b/resources/assets/enderio/textures/blocks/reservoirMbB.png index a0b4f933..343e1b98 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbB.png and b/resources/assets/enderio/textures/blocks/reservoirMbB.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbBl.png b/resources/assets/enderio/textures/blocks/reservoirMbBl.png index 0b66111c..059c288f 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbBl.png and b/resources/assets/enderio/textures/blocks/reservoirMbBl.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbBr.png b/resources/assets/enderio/textures/blocks/reservoirMbBr.png index b4673a70..6eaeeb57 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbBr.png and b/resources/assets/enderio/textures/blocks/reservoirMbBr.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbL.png b/resources/assets/enderio/textures/blocks/reservoirMbL.png index 17e486ae..8a4cf553 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbL.png and b/resources/assets/enderio/textures/blocks/reservoirMbL.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbR.png b/resources/assets/enderio/textures/blocks/reservoirMbR.png index 850d02c8..684ed9b1 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbR.png and b/resources/assets/enderio/textures/blocks/reservoirMbR.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbT.png b/resources/assets/enderio/textures/blocks/reservoirMbT.png index e060d808..523c975d 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbT.png and b/resources/assets/enderio/textures/blocks/reservoirMbT.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbTl.png b/resources/assets/enderio/textures/blocks/reservoirMbTl.png index a159821a..1a0b83d3 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbTl.png and b/resources/assets/enderio/textures/blocks/reservoirMbTl.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirMbTr.png b/resources/assets/enderio/textures/blocks/reservoirMbTr.png index 53f39cac..8e328d01 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirMbTr.png and b/resources/assets/enderio/textures/blocks/reservoirMbTr.png differ diff --git a/resources/assets/enderio/textures/blocks/reservoirSwitch.png b/resources/assets/enderio/textures/blocks/reservoirSwitch.png index 135dcad6..8ffda34d 100644 Binary files a/resources/assets/enderio/textures/blocks/reservoirSwitch.png and b/resources/assets/enderio/textures/blocks/reservoirSwitch.png differ diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png index 3c56b415..19ac54df 100644 Binary files a/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png and b/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png differ diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png index b734a486..3375f4d2 100644 Binary files a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png and b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png b/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png index 7197b8a9..eef5a1c7 100644 Binary files a/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png and b/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png differ diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png b/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png index 0ecb2e0b..3bc5fdc2 100644 Binary files a/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png and b/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/transceiver.png b/resources/assets/enderio/textures/blocks/transceiverModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transceiver.png rename to resources/assets/enderio/textures/blocks/transceiverModel.png diff --git a/resources/assets/enderio/textures/blocks/vatOverlayDisabled.png b/resources/assets/enderio/textures/blocks/vatOverlayDisabled.png deleted file mode 100644 index 43cdb532..00000000 Binary files a/resources/assets/enderio/textures/blocks/vatOverlayDisabled.png and /dev/null differ diff --git a/resources/assets/enderio/textures/blocks/vatOverlayPull.png b/resources/assets/enderio/textures/blocks/vatOverlayPull.png deleted file mode 100644 index 115dadcd..00000000 Binary files a/resources/assets/enderio/textures/blocks/vatOverlayPull.png and /dev/null differ diff --git a/resources/assets/enderio/textures/blocks/vatOverlayPush.png b/resources/assets/enderio/textures/blocks/vatOverlayPush.png deleted file mode 100644 index dd50e248..00000000 Binary files a/resources/assets/enderio/textures/blocks/vatOverlayPush.png and /dev/null differ diff --git a/resources/assets/enderio/textures/blocks/vatOverlayPushPull.png b/resources/assets/enderio/textures/blocks/vatOverlayPushPull.png deleted file mode 100644 index 6ec873d2..00000000 Binary files a/resources/assets/enderio/textures/blocks/vatOverlayPushPull.png and /dev/null differ diff --git a/src/main/java/crazypants/render/TechneUtil.java b/src/main/java/crazypants/render/TechneUtil.java index f1a78b94..f5f92695 100644 --- a/src/main/java/crazypants/render/TechneUtil.java +++ b/src/main/java/crazypants/render/TechneUtil.java @@ -229,7 +229,7 @@ public class TechneUtil { vt.apply(v); } - float factor = normal.offsetX != 0 ? 0.8f : normal.offsetZ != 0 ? 0.6f : normal.offsetY < 0 ? 0.5f : 1; + float factor = normal.offsetX != 0 ? 0.6f : normal.offsetZ != 0 ? 0.8f : normal.offsetY < 0 ? 0.5f : 1; int c = (int) (0xFF * factor); tes.setColorOpaque(c, c, c);