diff --git a/CHANGELOG.md b/CHANGELOG.md index 639c9e7b2..a46a08ed1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.5.19 +- Updated Forge to 2493 (MC 1.12.2) (raoulvdberge) + ### 1.5.18 - Added Project E integration for the External Storage on the Transmutation Table (raoulvdberge) - Added Project E integration for the energy values of Solderer items (raoulvdberge) diff --git a/build.gradle b/build.gradle index e3a73d314..982995572 100755 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.5.18" +version = "1.5.19" group = "refinedstorage" archivesBaseName = "refinedstorage" @@ -28,10 +28,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.12.1-14.22.0.2444" + version = "1.12.2-14.23.0.2493" runDir = "run" useDepAts = true - mappings = "snapshot_20170807" + mappings = "snapshot_20170926" } repositories { @@ -54,11 +54,11 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api" - runtime "mezz.jei:jei_1.12:4.7.5.84" + deobfCompile "mezz.jei:jei_1.12.2:4.7.11.101:api" + runtime "mezz.jei:jei_1.12.2:4.7.11.101" deobfCompile "MCMultiPart2:MCMultiPart:2.2.2" deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.0.4:api" - deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12-5.2.9:api" + deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.1-5.3.3:api" compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api" } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 443de323d..1a03198fe 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -21,7 +21,7 @@ public final class RS { } public static final String ID = "refinedstorage"; - public static final String VERSION = "1.5.18"; + public static final String VERSION = "1.5.19"; public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2363,);after:mcmultipart@[2.2.1,);after:storagedrawers@[1.12-5.2.2,);"; public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java index 5f55b58ad..f84bc81bf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java @@ -58,6 +58,6 @@ public class SoldererRecipeLoader { } return true; - }); + }, false, false); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 9c2fd9912..0d6b0e3c2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -72,7 +72,7 @@ public class ProxyClient extends ProxyCommon { CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getMinecraft().world, stack); if (BakedModelPattern.canDisplayPatternOutput(pattern)) { - int color = itemColors.getColorFromItemstack(pattern.getOutputs().get(0), tintIndex); + int color = itemColors.colorMultiplier(pattern.getOutputs().get(0), tintIndex); if (color != -1) { return color; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index ddca81412..96fd8d1d8 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "refinedstorage", "name": "Refined Storage", "description": "An elegant solution to your hoarding problem", - "version": "1.5.18", - "mcversion": "1.12.1", + "version": "1.5.19", + "mcversion": "1.12.2", "url": "https://refinedstorage.raoulvdberge.com", "updateUrl": "", "authorList": ["Refined Storage contributors"],