diff --git a/gradle.properties b/gradle.properties index bec2410d..3311855c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.7.10 forge_version=10.13.4.1614-1.7.10 forgeDep_version=10.13.4.1614 -mod_version=2.3.1.6_beta +mod_version=2.3.1.7_beta #Comment out this line to get rid of the appendix #mod_appendix=beta diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_1.png b/resources/assets/enderio/textures/models/armor/stellar_layer_1.png new file mode 100644 index 00000000..7dcac9f4 Binary files /dev/null and b/resources/assets/enderio/textures/models/armor/stellar_layer_1.png differ diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_2.png b/resources/assets/enderio/textures/models/armor/stellar_layer_2.png new file mode 100644 index 00000000..244dc233 Binary files /dev/null and b/resources/assets/enderio/textures/models/armor/stellar_layer_2.png differ diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 17be6df0..a1835185 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -55,6 +55,7 @@ public class ConduitRecipes { String binder = CONDUIT_BINDER.oreDict; ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal()); //Recipes addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder); @@ -167,6 +168,12 @@ public class ConduitRecipes { ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone"); + ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0); + addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian"); + + ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1); + addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot()); + ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0); addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench);