Skip to content

Commit fa5841e

Browse files
Alexander SiegAlexander Sieg
authored andcommitted
Fixed #129
1 parent 99adff4 commit fa5841e

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

common/net/teamio/taam/TaamRecipes.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ public static void addSmeltingRecipes(){
226226
GameRegistry.addSmelting(new ItemStack(TaamMain.itemDust, 1, Taam.BLOCK_ORE_META.iron.ordinal()), new ItemStack(TaamMain.itemIngot, 1, Taam.BLOCK_ORE_META.iron.ordinal()), 1);
227227
//Gold Dust -> Gold Ingot
228228
GameRegistry.addSmelting(new ItemStack(TaamMain.itemDust, 1, Taam.BLOCK_ORE_META.gold.ordinal()), new ItemStack(TaamMain.itemIngot, 1, Taam.BLOCK_ORE_META.gold.ordinal()), 1);
229+
//Rubber Bar -> Plastic sheets
230+
GameRegistry.addSmelting(new ItemStack(TaamMain.itemMaterial, 1, Taam.ITEM_MATERIAL_META.rubber_bar.ordinal()),new ItemStack(TaamMain.itemMaterial, 1, Taam.ITEM_MATERIAL_META.plastic_sheet.ordinal()) , 1);
229231
}
230232

231233
public static void addOreRecipes(){
@@ -273,10 +275,6 @@ public static void addOreRecipes(){
273275
'H', Blocks.hopper,
274276
'I', new ItemStack(TaamMain.itemPart,1,Taam.ITEM_PART_META.support_frame.ordinal())
275277
));
276-
// conveyor chute
277-
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TaamMain.blockProductionLine, 1, Taam.BLOCK_PRODUCTIONLINE_META.chute.ordinal()),
278-
new ItemStack(TaamMain.blockMachines,1,Taam.BLOCK_MACHINES_META.chute.ordinal()),
279-
new ItemStack(TaamMain.itemPart, 1, Taam.ITEM_PART_META.support_frame.ordinal())));
280278
// Shredder
281279
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TaamMain.blockProductionLine, 1, Taam.BLOCK_PRODUCTIONLINE_META.shredder.ordinal()),
282280
"PAP","MTB", "bSb",

log4j.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN"
3+
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
4+
<log4j:configuration>
5+
<Appenders>
6+
<Console name="Console" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
8+
</Console>
9+
</Appenders>
10+
<Loggers>
11+
<Root level="DEBUG">
12+
<AppenderRef ref="Console"/>
13+
</Root>
14+
</Loggers>
15+
</log4j:configuration>

0 commit comments

Comments
 (0)