dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to 1.5.19, update Forge and dependencies

Browse Source
This commit is contained in:
raoulvdberge
2017-09-26 20:45:04 +02:00
parent 8fa3551927
commit 74fda65889
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,5 +1,8 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.5.19
- Updated Forge to 2493 (MC 1.12.2) (raoulvdberge)
### 1.5.18 ### 1.5.18
- Added Project E integration for the External Storage on the Transmutation Table (raoulvdberge) - 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) - Added Project E integration for the energy values of Solderer items (raoulvdberge)

12
build.gradle
View File

@@ -20,7 +20,7 @@ apply plugin: 'maven'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.5.18" version = "1.5.19"
group = "refinedstorage" group = "refinedstorage"
archivesBaseName = "refinedstorage" archivesBaseName = "refinedstorage"
@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
minecraft { minecraft {
version = "1.12.1-14.22.0.2444" version = "1.12.2-14.23.0.2493"
runDir = "run" runDir = "run"
useDepAts = true useDepAts = true
mappings = "snapshot_20170807" mappings = "snapshot_20170926"
} }
repositories { repositories {
@@ -54,11 +54,11 @@ repositories {
} }
dependencies { dependencies {
deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api" deobfCompile "mezz.jei:jei_1.12.2:4.7.11.101:api"
runtime "mezz.jei:jei_1.12:4.7.5.84" runtime "mezz.jei:jei_1.12.2:4.7.11.101"
deobfCompile "MCMultiPart2:MCMultiPart:2.2.2" deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.0.4:api" 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" compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api"
} }

2
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -21,7 +21,7 @@ public final class RS {
} }
public static final String ID = "refinedstorage"; 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 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 GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update"; public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java
View File

@@ -58,6 +58,6 @@ public class SoldererRecipeLoader {
} }
return true; return true;
}); }, false, false);
} }
} }

2
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
View File

@@ -72,7 +72,7 @@ public class ProxyClient extends ProxyCommon {
CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getMinecraft().world, stack); CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getMinecraft().world, stack);
if (BakedModelPattern.canDisplayPatternOutput(pattern)) { 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) { if (color != -1) {
return color; return color;

4
src/main/resources/mcmod.info
View File

@@ -3,8 +3,8 @@
"modid": "refinedstorage", "modid": "refinedstorage",
"name": "Refined Storage", "name": "Refined Storage",
"description": "An elegant solution to your hoarding problem", "description": "An elegant solution to your hoarding problem",
"version": "1.5.18", "version": "1.5.19",
"mcversion": "1.12.1", "mcversion": "1.12.2",
"url": "https://refinedstorage.raoulvdberge.com", "url": "https://refinedstorage.raoulvdberge.com",
"updateUrl": "", "updateUrl": "",
"authorList": ["Refined Storage contributors"], "authorList": ["Refined Storage contributors"],