diff options
| author | Technus <daniel112092@gmail.com> | 2016-11-22 08:33:31 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-11-22 08:33:31 +0100 |
| commit | f40418336d126d5fd46a9736d427a0b3ba45de2b (patch) | |
| tree | 4fd31562d3c4c3f997f3892ddd3ac1192a7b2e15 | |
| parent | cc08c02610de2cd3a607890e213195db16d78330 (diff) | |
| parent | 1669bf61f8c7b9066e488daefd20be14acf9dad4 (diff) | |
| download | GT5-Unofficial-f40418336d126d5fd46a9736d427a0b3ba45de2b.tar.gz GT5-Unofficial-f40418336d126d5fd46a9736d427a0b3ba45de2b.tar.bz2 GT5-Unofficial-f40418336d126d5fd46a9736d427a0b3ba45de2b.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 0c26e24d2d..4956234daa 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.26.12 +gt.version=5.09.26.13 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index a3648364b4..d3d7e798bf 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1189,7 +1189,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { ItemList.Charcoal_Pile.set(new GT_MetaTileEntity_Charcoal_Pit(1155, "multimachine.charcoalpile", "Charcoal Pile Igniter").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Charcoal_Pile.get(1L, new Object[0]), bitsd, new Object[]{"EXE", "EME", " C ", 'M', ItemList.Hull_Steel_Bricks, 'E', OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X', OrePrefixes.rotor.get(Materials.Iron),}); + GT_ModHandler.addCraftingRecipe(ItemList.Charcoal_Pile.get(1L, new Object[0]), bitsd, new Object[]{"EXE", "EME", " C ", 'M', ItemList.Hull_Steel_Bricks, 'E', OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X', OrePrefixes.rotor.get(Materials.Steel),}); ItemList.Seismic_Prospector.set(new GT_MetaTileEntity_SeismicProspector(1156, "basicmachine.seismicprospector", "Seismic Prospector", 1).getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_Steel, 'W', OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Basic), 'C', ItemList.Sensor_LV}); |