mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.9.4
* development: A few minor fixes, added Ultimate Tier Installer texture New textures, round 1. Conflicts: src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/block/BlockGenerator.java
This commit is contained in:
commit
90a587383e
16 files changed
+13
-11
No files matched your search
@@ -158,7 +158,7 @@ public class MekanismGenerators implements IModule
|
||||
" I ", "IFI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Generator, 1, 10), Character.valueOf('F'), Blocks.IRON_BARS
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 13), new Object[] {
|
||||
"STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('E'), Items.BUCKET
|
||||
"STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('B'), Items.BUCKET
|
||||
}));
|
||||
|
||||
//Reactor Recipes
|
||||
|
||||
Reference in new issue
Block a user