diff --git a/CHANGELOG.md b/CHANGELOG.md index 83c0ed31e..321a0c473 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Refined Storage Changelog +### 0.8 +**Features** +- Recompile for Minecraft 1.10 + ### 0.7.19 **Bugfixes** - Fixed controller being buggy with reconnecting diff --git a/build.gradle b/build.gradle index a2629acde..7bb5e269a 100755 --- a/build.gradle +++ b/build.gradle @@ -12,12 +12,12 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' -version = "0.7.19" +version = "0.8" group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9.4-12.17.0.1969" + version = "1.10-12.18.0.1992-1.10.0" runDir = "run" useDepAts = true mappings = "snapshot_20160518" @@ -30,7 +30,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.9.4:3.6.+" + deobfCompile "mezz.jei:jei_1.10:3.7.+" } processResources { diff --git a/screenshots/controller.png b/screenshots/controller.png index 2f7d324cf..d1a87e31d 100755 Binary files a/screenshots/controller.png and b/screenshots/controller.png differ diff --git a/screenshots/crafting.png b/screenshots/crafting.png new file mode 100755 index 000000000..0363b8129 Binary files /dev/null and b/screenshots/crafting.png differ diff --git a/screenshots/overview.png b/screenshots/overview.png index 5a36ff585..1be1c7dce 100755 Binary files a/screenshots/overview.png and b/screenshots/overview.png differ diff --git a/screenshots/wireless_grid.png b/screenshots/wireless_grid.png new file mode 100755 index 000000000..1ff0223cc Binary files /dev/null and b/screenshots/wireless_grid.png differ diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 85b8b9ff1..0fa0487c0 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy; @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) public final class RefinedStorage { public static final String ID = "refinedstorage"; - public static final String VERSION = "0.7.19"; + public static final String VERSION = "0.8"; public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java index 77ff1a059..e665551fb 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java @@ -25,7 +25,7 @@ public class GuiCraftingSettings extends GuiBase { private GuiButton[] incrementButtons = new GuiButton[6]; public GuiCraftingSettings(GuiGrid gui, EntityPlayer player, ItemStack stack) { - super(new ContainerCraftingSettings(player, stack), 170, 99); + super(new ContainerCraftingSettings(player, stack), 172, 99); this.gui = gui; this.stack = stack; diff --git a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java index 69c958772..473aafaac 100755 --- a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java +++ b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java @@ -1,9 +1,9 @@ package refinedstorage.jei; +import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import mezz.jei.gui.ingredients.IGuiIngredient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 8a66b1de2..aff3196d6 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "refinedstorage", "name": "Refined Storage", "description": "A Minecraft mod all about storage.", - "version": "0.7.19", - "mcversion": "1.9.4", + "version": "0.8", + "mcversion": "1.10", "url": "", "updateUrl": "", "authorList": ["Refined Storage contributors"],