From dce74d44598ee89612cc2a84022c2be4743823b0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 20 Jul 2016 23:47:51 -0400 Subject: [PATCH] Fixed Precision Sawmill duplication --- src/main/java/mekanism/common/Mekanism.java | 12 ++++++------ .../textures/blocks/ctm/Teleporter-ctm.png | Bin 4226 -> 0 bytes .../mekanism/textures/blocks/ctm/Teleporter.png | Bin 1832 -> 0 bytes 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 0a85854d1..565ed24b7 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -903,12 +903,12 @@ public class Mekanism RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.TRAPDOOR), new ItemStack(Blocks.PLANKS, 3)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BOAT), new ItemStack(Blocks.PLANKS, 5)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BED), new ItemStack(Blocks.PLANKS, 3), new ItemStack(Blocks.WOOL, 3), 1); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.OAK_DOOR), new ItemStack(Blocks.PLANKS, 6, 0)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.SPRUCE_DOOR), new ItemStack(Blocks.PLANKS, 6, 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BIRCH_DOOR), new ItemStack(Blocks.PLANKS, 6, 2)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.JUNGLE_DOOR), new ItemStack(Blocks.PLANKS, 6, 3)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.ACACIA_DOOR), new ItemStack(Blocks.PLANKS, 6, 4)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.DARK_OAK_DOOR), new ItemStack(Blocks.PLANKS, 6, 5)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.OAK_DOOR), new ItemStack(Blocks.PLANKS, 2, 0)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.SPRUCE_DOOR), new ItemStack(Blocks.PLANKS, 2, 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BIRCH_DOOR), new ItemStack(Blocks.PLANKS, 2, 2)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.JUNGLE_DOOR), new ItemStack(Blocks.PLANKS, 2, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.ACACIA_DOOR), new ItemStack(Blocks.PLANKS, 2, 4)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.DARK_OAK_DOOR), new ItemStack(Blocks.PLANKS, 2, 5)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.JUKEBOX), new ItemStack(Blocks.PLANKS, 8), new ItemStack(Items.DIAMOND), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.BOOKSHELF), new ItemStack(Blocks.PLANKS, 6), new ItemStack(Items.BOOK, 3), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.WOODEN_PRESSURE_PLATE), new ItemStack(Blocks.PLANKS, 2)); diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png deleted file mode 100644 index 365fac6f48bc6d686cb4d4c5e92f03df3301d144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4226 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 G`~L#lY4%M3 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png deleted file mode 100644 index f5d08dd55a45732e31b078b12603f248d81a0cba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1832 zcmbVNc~BE~6pn&osYg{nh$8Ds71SKNNq`NY=7cy#Q=kSdRYG=;6-Kn!Q3h{L1sSX;1$9s?B9~Wj3f68EZ2xflqdT+vyT0#z@4er9v%58` zf~GjK9a${a6jiW1gc$+bJ83-g9dYd|Vg@%_5l)9v2HK)CVJrzsMPY!7&_!b*m<~;h zufqaZEIS+z3#Y@?E5&+>;OcA`u9Yw{Y!)kEnboM%$6_=Pg+=3JAUJUT0tnz}AgC3o z`D&vKi@}4FOju~rsxW<0tR6wZWlMnotC%rBV6+af5^u@vJ%{590E91YwKo9okHXVE?-DQM5TM z(TMRvFf)~4(lhsAm_J5la`$N=8<6ovyxN2_m!gZ4Q~Cq~BWaa95M)lcD2|GykW4BP z`p6}IQiVbQG2z3$Qiak-Dv-+LGJ$B!#>co2qJ)%u#78ca_&|_CDCH|)1tL*Md__t~ zDwmCMRiv5Lk$P-Q7iV-wxuQ>U#WEA7qbXAuMa7L(fF_2bDRT^E1Y|P6ON)~zWifl( zZs&cla?FHp!ce7&B7k@472_X~7eG;dhycPk7@|ixe4)_5@e`o}4kqw}5fKa{h`<1j z^3ng3HXh>;&sHD*sh6=WrU-4*57o~sKJ*VpGEHM*x+C?obHPm0eXWv9!mMqTYtEB1 zB~BfQy;t`8f!><&GfL((#1{rT(X`Xen=P6bl9wgjS>3N4gC0ai%uDwyw+BzP4j;Qi|Z@j+9iyV6N<*S6!+KRb<)|PV1t_Mdc zM;tii#fxq%s*CXGt2w%V(iwT)JIYQ+2?GkUp3p1S++Mvnp`-=mg;t-AaFd?NKWs<$ zvB;?xwar!Y7B;}^)-P%+tn9ipIC!z2*tBfU-i@xDhgHg`)7s%h^nZAoF~if7A(R)>(ks{+-vM=w3GT^~isk_)3fPD$i zdD^FD`Dahes0}h)8}Zwhbv?EI^obv*PaEu+u_;M)5k6y2$Gq8^%$Y?{)cMM9n#RX? z1|Ps~X0V^JoMo%zkC8*EhRjqhmz%rQDAP19;h^+AYFfw{W{-p;`<&owmN^AV4x2?wxg@Lu{1*o zOc>Dkb{73T_slv@8r$XG%IN#vIgY~{>!a{1o}B(WDL)sm>mCpHZ^^U2n+fQ1W8XIpf_79z6e|cbM*i0i)yj$(eZL#FI zH-rp1&sy(t#Hx)~qV1)UJ<2?Ozi+HK=lphJ&biV)Xq|1OncmAq6Mx#J&(!rG?*