Change uvlock for 3 models, minimum CC version, we need CC

This commit is contained in:
raoulvdberge
2017-02-02 12:05:29 +01:00
parent 81e94ef727
commit c7a2e9a908
7 changed files with 29 additions and 7 deletions

View File

@@ -33,6 +33,7 @@
- Fixed disk textures not working on latest Forge (raoulvdberge) - Fixed disk textures not working on latest Forge (raoulvdberge)
- Handle breaking and placing blocks better for Constructor and Destructor (way2muchnoise) - Handle breaking and placing blocks better for Constructor and Destructor (way2muchnoise)
- Updated Forge to 2226 (raoulvdberge) - Updated Forge to 2226 (raoulvdberge)
- Updated Chinese translation (TartaricAcid)
### 1.3.5 ### 1.3.5
- Fixed TPS lag on very large crafting tasks (way2muchnoise) - Fixed TPS lag on very large crafting tasks (way2muchnoise)
@@ -80,12 +81,33 @@
- Removed IC2 support (raoulvdberge) - Removed IC2 support (raoulvdberge)
- Removed MCMultiPart support (will be re-added as soon as MCMultiPart for MC 1.11 is available) (raoulvdberge) - Removed MCMultiPart support (will be re-added as soon as MCMultiPart for MC 1.11 is available) (raoulvdberge)
### 1.2.19
- Added integration for Collosal Chests for the External Storage, Importer and Exporter improving performance (way2muchnoise)
- Exposed the Network Card inventory of the Network Transmitter so other tiles can interact with it (raoulvdberge)
- Increased size of Detector textbox (way2muchnoise)
- Autocrafting bugfixes (way2muchnoise)
- Fixed stack upgrades not working in exporter when stack size is 16 (way2muchnoise)
- Fixed crash when rotating External Storage (raoulvdberge)
- Handle breaking and placing blocks better for Constructor and Destructor (way2muchnoise)
- Updated cable part back texture and Construction and Destruction Core textures (CyanideX)
- Updated Forge to 2221 (raoulvdberge)
- Fixed disk textures not working on latest Forge (raoulvdberge)
- Updated Chinese translation (TartaricAcid)
### 1.2.18
- Performance improvements with oredict autocrafting (way2muchnoise)
- Fixed client side crash with cable (raoulvdberge)
- Fixed client side crash with disk drive (raoulvdberge)
- Fixed crash with external storage in fluid mode (raoulvdberge)
- Fluid Grid now first tries to get buckets from your inventory instead of the storage (raoulvdberge)
### 1.2.17 ### 1.2.17
- Ignore damage for damageable items when transferring into crafting grid (way2muchnoise) - Ignore damage for damageable items when transferring into crafting grid (way2muchnoise)
- Ignore tags from given items when transferring into crafting grid (way2muchnoise) - Ignore tags from given items when transferring into crafting grid (way2muchnoise)
- Remove sidedness from fluid interface (way2muchnoise) - Remove sidedness from fluid interface (way2muchnoise)
- Using tab in a grid that isn't in autoselected mode will focus on the search box (raoulvdberge) - Using tab in a grid that isn't in autoselected mode will focus on the search box (raoulvdberge)
- Add Ore Dictionary grid filter (use $ as prefix like in JEI) (way2muchnoise) - Add Ore Dictionary grid filter (use $ as prefix like in JEI) (way2muchnoise)
- The Stack Upgrade in a Constructor in item dropping mode will drop stacks of items at a time (raoulvdberge)
- Fixed Constructor in liquid mode being able to place fluids <1000 mB (raoulvdberge) - Fixed Constructor in liquid mode being able to place fluids <1000 mB (raoulvdberge)
- Fixed Solderer recipe conflicts, allowing for easier automation (raoulvdberge) - Fixed Solderer recipe conflicts, allowing for easier automation (raoulvdberge)
- Fixed machines not connecting with cable after Controller (raoulvdberge) - Fixed machines not connecting with cable after Controller (raoulvdberge)

View File

@@ -51,8 +51,8 @@ dependencies {
deobfCompile "mezz.jei:jei_1.11.2:4.2.4.226:api" deobfCompile "mezz.jei:jei_1.11.2:4.2.4.226:api"
runtime "mezz.jei:jei_1.11.2:4.2.4.226" runtime "mezz.jei:jei_1.11.2:4.2.4.226"
deobfCompile "net.darkhax.tesla:Tesla:1.11-1.3.0.51" deobfCompile "net.darkhax.tesla:Tesla:1.11-1.3.0.51"
deobfCompile "org.cyclops.cyclopscore:CyclopsCore:1.11.2-0.9.1-476" deobfCompile "org.cyclops.cyclopscore:CyclopsCore:1.11.2-0.9.2-483"
deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.0-81" deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.1-95"
} }
processResources { processResources {

View File

@@ -23,7 +23,7 @@ public final class RS {
public static final String ID = "refinedstorage"; public static final String ID = "refinedstorage";
public static final String VERSION = "1.4"; public static final String VERSION = "1.4";
public static final String DEPENDENCIES = "required-after:forge@[13.19.1.2188,);"; public static final String DEPENDENCIES = "required-after:forge@[13.19.1.2188,);after:commoncapabilities@[1.3.1,);";
public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
@SidedProxy(clientSide = "com.raoulvdberge.refinedstorage.proxy.ProxyClient", serverSide = "com.raoulvdberge.refinedstorage.proxy.ProxyCommon") @SidedProxy(clientSide = "com.raoulvdberge.refinedstorage.proxy.ProxyClient", serverSide = "com.raoulvdberge.refinedstorage.proxy.ProxyCommon")

View File

@@ -4,6 +4,6 @@ import net.minecraftforge.fml.common.Loader;
public final class IntegrationCyclopsCore { public final class IntegrationCyclopsCore {
public static boolean isLoaded() { public static boolean isLoaded() {
return Loader.isModLoaded("cyclopscore"); return Loader.isModLoaded("cyclopscore") && Loader.isModLoaded("commoncapabilities");
} }
} }

View File

@@ -7,7 +7,7 @@
"line": "refinedstorage:blocks/generic_grey" "line": "refinedstorage:blocks/generic_grey"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": false
}, },
"variants": { "variants": {
"inventory": [ "inventory": [

View File

@@ -7,7 +7,7 @@
"line": "refinedstorage:blocks/generic_grey" "line": "refinedstorage:blocks/generic_grey"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": false
}, },
"variants": { "variants": {
"inventory": [ "inventory": [

View File

@@ -7,7 +7,7 @@
"line": "refinedstorage:blocks/generic_grey" "line": "refinedstorage:blocks/generic_grey"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": false
}, },
"variants": { "variants": {
"inventory": [ "inventory": [