diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 941144813..30d399d8d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e65eaf487..9397848f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 18 11:22:27 GMT 2015 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/bronzeIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/bronzeIngot.png index 086aab236..4b44d747e 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/ingot/bronzeIngot.png and b/src/main/resources/assets/techreborn/textures/items/ingot/bronzeIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/chromiumIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/chromiumIngot.png new file mode 100644 index 000000000..cb4ebbe67 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/ingot/chromiumIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/copperIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/copperIngot.png index 67ad17394..36c782881 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/ingot/copperIngot.png and b/src/main/resources/assets/techreborn/textures/items/ingot/copperIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/nickelIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/nickelIngot.png index 8015dc7e3..6537f30f0 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/ingot/nickelIngot.png and b/src/main/resources/assets/techreborn/textures/items/ingot/nickelIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/roseGoldIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/roseGoldIngot.png new file mode 100644 index 000000000..1968fd808 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/ingot/roseGoldIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/stainlessSteelIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/stainlessSteelIngot.png new file mode 100644 index 000000000..c85c6be2e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/ingot/stainlessSteelIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/steelIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/steelIngot.png index a6db68b28..b4fdd1c5a 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/ingot/steelIngot.png and b/src/main/resources/assets/techreborn/textures/items/ingot/steelIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/tinIngot.png b/src/main/resources/assets/techreborn/textures/items/ingot/tinIngot.png index 14aaf1658..13fea84a9 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/ingot/tinIngot.png and b/src/main/resources/assets/techreborn/textures/items/ingot/tinIngot.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lithiumBatteryEmpty - Copy.png b/src/main/resources/assets/techreborn/textures/items/tool/lithiumBatteryEmpty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lithiumBatteryEmpty - Copy.png rename to src/main/resources/assets/techreborn/textures/items/tool/lithiumBatteryEmpty.png