Browse Source

Added Lubricant Recipe using Talc and Oil and added a Nugget Mold

Gregorius Techneticies 3 months ago
parent
commit
f190b91359
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 8
- 8
src/main/java/gregapi/data/FL.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -382,26 +382,26 @@ public enum FL {
382 382
 	, Tequila                   ("binnie.tequila"           , "tequila"                     , SIMPLE, LIQUID, FOOD, ALCOHOLIC)
383 383
 	, Alcopops                  ("potion.alcopops"                                          , SIMPLE, LIQUID, FOOD, ALCOHOLIC)
384 384
 
385
+	, Oil_Frying                ("hotfryingoil"                                             , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
386
+	, Oil_Seed                  ("seedoil"                                                  , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
387
+	, Oil_Plant                 ("plantoil"                                                 , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
385 388
 	, Oil_Sunflower             ("sunfloweroil"                                             , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
386 389
 	, Oil_Olive                 ("binnie.juiceolive"        , "oliveoil"                    , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
387 390
 	, Oil_Nut                   ("nutoil"                                                   , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
388 391
 	, Oil_Lin                   ("linoil"                   , "linseedoil"                  , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
389 392
 	, Oil_Hemp                  ("hempoil"                  , "hempseedoil"                 , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
390
-	, Oil_Seed                  ("seedoil"                                                  , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
391 393
 	, Oil_Fish                  ("fishoil"                                                  , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
392
-	, Oil_Frying                ("hotfryingoil"                                             , SIMPLE, LIQUID, FOOD, COOKING_OIL, BATH)
393 394
 	, Oil_Canola                ("canolaoil"                                                , SIMPLE, LIQUID)
394
-	, Oil_Plant                 ("plantoil"                                                 , SIMPLE, LIQUID)
395 395
 	, Oil_Creosote              ("creosote"                                                 , SIMPLE, LIQUID, BATH)
396 396
 	, Oil_Soulsand              ("soulsandoil"                                              , SIMPLE, LIQUID)
397
-	, Oil_Normal                ("oil"                      , "oilgc"                       , SIMPLE, LIQUID)
398 397
 	, Oil_Light                 ("liquid_light_oil"                                         , SIMPLE, LIQUID)
398
+	, Oil_Light2                ("lightoil"                                                 , SIMPLE, LIQUID)
399
+	, Oil_Normal                ("oil"                      , "oilgc"                       , SIMPLE, LIQUID)
399 400
 	, Oil_Medium                ("liquid_medium_oil"                                        , SIMPLE, LIQUID)
401
+	, Oil_HotCrude              ("hotcrude"                                                 , SIMPLE, LIQUID)
400 402
 	, Oil_Heavy                 ("liquid_heavy_oil"                                         , SIMPLE, LIQUID)
401
-	, Oil_ExtraHeavy            ("liquid_extra_heavy_oil"                                   , SIMPLE, LIQUID)
402
-	, Oil_Light2                ("lightoil"                                                 , SIMPLE, LIQUID)
403 403
 	, Oil_Heavy2                ("heavyoil"                                                 , SIMPLE, LIQUID)
404
-	, Oil_HotCrude              ("hotcrude"                                                 , SIMPLE, LIQUID)
404
+	, Oil_ExtraHeavy            ("liquid_extra_heavy_oil"                                   , SIMPLE, LIQUID)
405 405
 	
406 406
 	, Gas_Natural               ("gas_natural_gas"          , "naturalgas", "gas.natural"   , SIMPLE, GAS)
407 407
 	, Methane                   ("methane"                                                  , SIMPLE, GAS)

+ 1
- 1
src/main/java/gregapi/data/IL.java View File

@@ -224,7 +224,7 @@ public enum IL implements IItemContainer {
224 224
 	Ceramic_Funnel, Ceramic_Funnel_Raw,
225 225
 	Ceramic_Crucible, Ceramic_Crucible_Raw,
226 226
 	Ceramic_Basin, Ceramic_Basin_Raw,
227
-	Ceramic_Mold, Ceramic_Mold_Raw, Ceramic_Ingot_Mold_Raw, Ceramic_Chunk_Mold_Raw, Ceramic_Plate_Mold_Raw, Ceramic_Tiny_Plate_Mold_Raw, Ceramic_Bolt_Mold_Raw, Ceramic_Rod_Mold_Raw, Ceramic_Long_Rod_Mold_Raw, Ceramic_Item_Casing_Mold_Raw, Ceramic_Ring_Mold_Raw, Ceramic_Gear_Mold_Raw, Ceramic_Small_Gear_Mold_Raw, Ceramic_Sword_Mold_Raw, Ceramic_Pickaxe_Mold_Raw, Ceramic_Spade_Mold_Raw, Ceramic_Shovel_Mold_Raw, Ceramic_Universal_Spade_Mold_Raw, Ceramic_Axe_Mold_Raw, Ceramic_Double_Axe_Mold_Raw, Ceramic_Saw_Mold_Raw, Ceramic_Hammer_Mold_Raw, Ceramic_File_Mold_Raw, Ceramic_Screwdriver_Mold_Raw, Ceramic_Chisel_Mold_Raw, Ceramic_Arrow_Mold_Raw, Ceramic_Hoe_Mold_Raw, Ceramic_Sense_Mold_Raw, Ceramic_Plow_Mold_Raw, Ceramic_Builderwand_Mold_Raw,
227
+	Ceramic_Mold, Ceramic_Mold_Raw, Ceramic_Ingot_Mold_Raw, Ceramic_Chunk_Mold_Raw, Ceramic_Nugget_Mold_Raw, Ceramic_Plate_Mold_Raw, Ceramic_Tiny_Plate_Mold_Raw, Ceramic_Bolt_Mold_Raw, Ceramic_Rod_Mold_Raw, Ceramic_Long_Rod_Mold_Raw, Ceramic_Item_Casing_Mold_Raw, Ceramic_Ring_Mold_Raw, Ceramic_Gear_Mold_Raw, Ceramic_Small_Gear_Mold_Raw, Ceramic_Sword_Mold_Raw, Ceramic_Pickaxe_Mold_Raw, Ceramic_Spade_Mold_Raw, Ceramic_Shovel_Mold_Raw, Ceramic_Universal_Spade_Mold_Raw, Ceramic_Axe_Mold_Raw, Ceramic_Double_Axe_Mold_Raw, Ceramic_Saw_Mold_Raw, Ceramic_Hammer_Mold_Raw, Ceramic_File_Mold_Raw, Ceramic_Screwdriver_Mold_Raw, Ceramic_Chisel_Mold_Raw, Ceramic_Arrow_Mold_Raw, Ceramic_Hoe_Mold_Raw, Ceramic_Sense_Mold_Raw, Ceramic_Plow_Mold_Raw, Ceramic_Builderwand_Mold_Raw,
228 228
 	Ceramic_Faucet, Ceramic_Faucet_Raw,
229 229
 	Ceramic_Crossing, Ceramic_Crossing_Raw,
230 230
 	Juicer, Juicer_Raw,

+ 1
- 1
src/main/java/gregtech/compat/Compat_Recipes_IndustrialCraft.java View File

@@ -571,7 +571,7 @@ public class Compat_Recipes_IndustrialCraft extends CompatMods {
571 571
 		
572 572
 		new OreDictListenerEvent_Names() {@Override public void addAllListeners() {
573 573
 		addListener("blockSolidObsidian", "blockDustObsidian", new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
574
-			RM.Press        .addRecipe2(T, 16,   64, IL.IC2_Compressed_Coal_Ball.get(8), aEvent.mStack, IL.IC2_Compressed_Coal_Chunk.get(1));
574
+			RM.Press.addRecipe2(T, 16,   64, IL.IC2_Compressed_Coal_Ball.get(8), aEvent.mStack, IL.IC2_Compressed_Coal_Chunk.get(1));
575 575
 		}});
576 576
 		addListener("cropIvy", new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
577 577
 			RM.pulverizing(aEvent.mStack, IL.IC2_Grin_Powder.get(1));

+ 4
- 4
src/main/java/gregtech/compat/Compat_Recipes_Railcraft.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -77,7 +77,7 @@ public class Compat_Recipes_Railcraft extends CompatMods {
77 77
 		RM.packunpack(IL.RC_Tie_Stone.get(4), IL.RC_Bed_Stone.get(1));
78 78
 		
79 79
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8,  0), tBits | DEL_IF_NO_DYES                                , tHammer+"PP"   , tWrench+"PP"                            , 'P', OP.plate.dat(ANY.Fe)                     );
80
-		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8,  1), tBits | DEL_IF_NO_DYES                                , "GPG"          , "PGP"              , "GPG"              , 'P', OP.plate.dat(ANY.Fe)                     , 'G', Blocks.glass_pane);
80
+		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8,  1), tBits | DEL_IF_NO_DYES                                , "GPG"          , "PGP"              , "GPG"              , 'P', OP.plate.dat(ANY.Fe)                     , 'G', OD.paneGlassColorless);
81 81
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8,  2), tBits | DEL_IF_NO_DYES                                , "BPB"          , "PLP"              , "BPB"              , 'P', OP.plate.dat(ANY.Fe)                     , 'B', Blocks.iron_bars, 'L', OD.lever);
82 82
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 1,  3), tBits | DEL_IF_NO_DYES                                , tWrench+"P"    , tHammer+"P"                             , 'P', OP.plate.dat(ANY.Fe)                     );
83 83
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 1,  4), tBits | DEL_IF_NO_DYES                                , tWrench+"P"    , tHammer+"P"                             , 'P', OP.plate.dat(ANY.Steel)                  );
@@ -90,7 +90,7 @@ public class Compat_Recipes_Railcraft extends CompatMods {
90 90
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 1, 11), tBits                                                 , "OOO"          , "OEO"              , "OOO"              , 'E', OP.gem.dat(MT.EnderPearl)                , 'O', OP.blockSolid.dat(MT.Obsidian));
91 91
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 1, 12), tBits                                                 , "GPG"          , "PAP"              , "GPG"              , 'P', OD.craftingPiston                        , 'A', OD.craftingAnvil, 'G', ST.make(MD.RC, "part.gear", 1, 2));
92 92
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8, 13), tBits | DEL_IF_NO_DYES                                , tHammer+"PP"   , tWrench+"PP"                            , 'P', OP.plate.dat(ANY.Steel)                  );
93
-		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8, 14), tBits | DEL_IF_NO_DYES                                , "GPG"          , "PGP"              , "GPG"              , 'P', OP.plate.dat(ANY.Steel)                  , 'G', Blocks.glass_pane);
93
+		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8, 14), tBits | DEL_IF_NO_DYES                                , "GPG"          , "PGP"              , "GPG"              , 'P', OP.plate.dat(ANY.Steel)                  , 'G', OD.paneGlassColorless);
94 94
 		CR.shaped(ST.make(MD.RC, "machine.beta"           , 8, 15), tBits | DEL_IF_NO_DYES                                , "BPB"          , "PLP"              , "BPB"              , 'P', OP.plate.dat(ANY.Steel)                  , 'B', Blocks.iron_bars, 'L', OD.lever);
95 95
 		
96 96
 		CR.shaped(IL.RC_ShuntingWireFrame.get(6)                  , tBits                                                 , "PPP"          , "R"+tWrench+"R"    , "RRR"              , 'P', OP.plate.dat(ANY.Fe)                     , 'R', IL.RC_Rebar.get(1));
@@ -100,7 +100,7 @@ public class Compat_Recipes_Railcraft extends CompatMods {
100 100
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  2), tBits                                                 , "IOI"          , "GEG"              , "IOI"              , 'I', tIngot.dat(MT.Au)                        , 'G', OP.gem.dat(ANY.Emerald), 'E', OP.gem.dat(MT.EnderPearl), 'O', OP.blockSolid.dat(MT.Obsidian));
101 101
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 4,  3), tBits                                                 , "PPP"          , "PFP"              , "PPP"              , 'P', OP.plate.dat(ANY.Steel)                  , 'F', OD.craftingFurnace);
102 102
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  5), tBits                                                 , " N "          , "RCR"                                   , 'R', OD.itemRedstone                          , 'N', OP.stone.dat(MT.Netherrack), 'C', Items.cauldron);
103
-		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  6), tBits                                                 , "PGP"          , "EDE"              , "PGP"              , 'E', OP.gem.dat(ANY.Emerald)                  , 'P', OP.plate.dat(ANY.Steel), 'G', Blocks.glass_pane, 'D', Blocks.dispenser);
103
+		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  6), tBits                                                 , "PGP"          , "EDE"              , "PGP"              , 'E', OP.gem.dat(ANY.Emerald)                  , 'P', OP.plate.dat(ANY.Steel), 'G', OD.paneGlassColorless, 'D', Blocks.dispenser);
104 104
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  8), tBits                                                 , "IPI"          , "PCP"              , "IPI"              , 'P', OD.craftingPiston                        , 'I', tIngot.dat(ANY.Fe), 'C', Blocks.crafting_table);
105 105
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  9), tBits                                                 , " I "          , " T "              , " D "              , 'I', Blocks.iron_bars                         , 'T', ST.make(MD.RC, "machine.beta", 1, 4), 'D', Blocks.dispenser);
106 106
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1, 10), tBits                                                 , " I "          , "RTR"              , " D "              , 'I', Blocks.iron_bars                         , 'T', ST.make(MD.RC, "machine.beta", 1, 4), 'D', Blocks.dispenser, 'R', OD.itemRedstone);

+ 7
- 4
src/main/java/gregtech/items/MultiItemFood.java View File

@@ -651,7 +651,8 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
651 651
 		CR.shapeless(IL.Food_Bun_Raw.get(1), CR.DEF_NAC, new Object[] {"foodDough"});
652 652
 		CR.shapeless(IL.Food_Buns_Sliced.get(1), CR.DEF_NAC, new Object[] {IL.Food_Bun_Sliced, IL.Food_Bun_Sliced});
653 653
 		CR.shapeless(IL.Food_Bun_Sliced.get(2), CR.DEF_NAC, new Object[] {IL.Food_Buns_Sliced});
654
-		RM.Slicer.addRecipe2(T, 16,   16, IL.Food_Bun.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Bun_Sliced.get(2));
654
+		RM.packunpack(IL.Food_Bun_Sliced.get(2), IL.Food_Buns_Sliced.get(1));
655
+		RM.Slicer.addRecipe2(T, 16, 16, IL.Food_Bun.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Bun_Sliced.get(2));
655 656
 		
656 657
 		IL.Food_Burger_Veggie                  .set(addItem(tLastID =  5010, "Veggie Burger"                            , "No matter how you call this, this is NOT a Burger!"          , new FoodStat( 4, 1.200F,   0, C+35,  0.30F,   0,   0,   0,  12,   0, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 2), TC.stack(TC.FAMES, 1)));
657 658
 		IL.Food_Burger_Cheese                  .set(addItem(tLastID =  5011, "Cheese Burger"                            , "Cheesy!"                                                     , new FoodStat( 4, 1.400F,   0, C+38,  0.50F,   0,   0,   8,   0,   8, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 1), TC.stack(TC.FAMES, 2)));
@@ -689,7 +690,8 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
689 690
 		CR.shapeless(IL.Food_Bread_Raw.get(1), CR.DEF_NAC, new Object[] {"foodDough", "foodDough"});
690 691
 		CR.shapeless(IL.Food_Breads_Sliced.get(1), CR.DEF_NAC, new Object[] {IL.Food_Bread_Sliced, IL.Food_Bread_Sliced});
691 692
 		CR.shapeless(IL.Food_Bread_Sliced.get(2), CR.DEF_NAC, new Object[] {IL.Food_Breads_Sliced});
692
-		RM.Slicer.addRecipe2(T, 16,   16, IL.Food_Bread.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Bread_Sliced.get(2));
693
+		RM.packunpack(IL.Food_Bread_Sliced.get(2), IL.Food_Breads_Sliced.get(1));
694
+		RM.Slicer.addRecipe2(T, 16, 16, IL.Food_Bread.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Bread_Sliced.get(2));
693 695
 		
694 696
 		IL.Food_Sandwich_Veggie                .set(addItem(tLastID =  6010, "Veggie Sandwich"                          , "It's Canon, Guys! Season 4, Vegan Morty!"                    , new FoodStat( 7, 1.200F,   0, C+35,  0.30F,   0,   0,   0,  24,   0, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 2), TC.stack(TC.FAMES, 1)));                                                  setFluidContainerStats(tLastID, 0, 32);
695 697
 		IL.Food_Sandwich_Cheese                .set(addItem(tLastID =  6011, "Cheese Sandwich"                          , "Say Cheese!"                                                 , new FoodStat( 7, 1.400F,   0, C+38,  0.50F,   0,   0,  16,   0,  16, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 1), TC.stack(TC.FAMES, 2)));                                                  setFluidContainerStats(tLastID, 0, 32);
@@ -718,8 +720,9 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
718 720
 		CR.shapeless(IL.Food_Baguette_Raw.get(1), CR.DEF_NAC, new Object[] {"foodDough", "foodDough", "foodDough"});
719 721
 		CR.shapeless(IL.Food_Baguettes_Sliced.get(1), CR.DEF_NAC, new Object[] {IL.Food_Baguette_Sliced, IL.Food_Baguette_Sliced});
720 722
 		CR.shapeless(IL.Food_Baguette_Sliced.get(2), CR.DEF_NAC, new Object[] {IL.Food_Baguettes_Sliced});
721
-		RM.Slicer.addRecipe2(T, 16,   16, IL.Food_Baguette.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Baguette_Sliced.get(2));
722
-
723
+		RM.packunpack(IL.Food_Baguette_Sliced.get(2), IL.Food_Baguette_Sliced.get(1));
724
+		RM.Slicer.addRecipe2(T, 16, 16, IL.Food_Baguette.get(1), IL.Shape_Slicer_Split.get(0), IL.Food_Baguette_Sliced.get(2));
725
+		
723 726
 		IL.Food_Large_Sandwich_Veggie          .set(addItem(tLastID =  7010, "Large Veggie Sandwich"                    , "Meatless"                                                    , new FoodStat(15, 2.200F,   0, C+35,  0.30F,   0,   0,   0,  36,   0, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 3), TC.stack(TC.FAMES, 1)));                                                  setFluidContainerStats(tLastID, 0, 16);
724 727
 		IL.Food_Large_Sandwich_Cheese          .set(addItem(tLastID =  7011, "Large Cheese Sandwich"                    , "I need another cheesy tooltip for this"                      , new FoodStat(15, 2.400F,   0, C+38,  0.50F,   0,   0,  24,   0,  24, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 1), TC.stack(TC.FAMES, 3)));                                                  setFluidContainerStats(tLastID, 0, 16);
725 728
 		IL.Food_Large_Sandwich_Bacon           .set(addItem(tLastID =  7014, "Large Bacon Sandwich"                     , "For Men! (and manly Women)"                                  , new FoodStat(20, 2.800F,   0, C+38,  0.50F,   0,   0,  16,   0,  36, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.HERBA, 2), TC.stack(TC.FAMES, 1), TC.stack(TC.CORPUS, 2)));                          setFluidContainerStats(tLastID, 0, 16);

+ 13
- 12
src/main/java/gregtech/items/MultiItemRandomTools.java View File

@@ -81,7 +81,7 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
81 81
 		
82 82
 		IL.Porcelain_Cup_Raw               .set(addItem(899, "Modeled Porcelain Cup"    , "Put in Furnace to harden", new OreDictItemData(MT.Porcelain, U), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS, 1))); CR.shapeless(OP.dust.mat(MT.Porcelain, 1), CR.DEF_NCC, new Object[] {last()});
83 83
 		
84
-		CR.shaped(IL.Porcelain_Cup_Raw   .get(1), CR.DEF_NCC    , "kPR"              , 'P', OP.dust.dat(MT.Porcelain), 'R', OreDictToolNames.rollingpin);
84
+		CR.shaped(IL.Porcelain_Cup_Raw   .get(1), CR.DEF_NCC, "kPR"              , 'P', OP.dust.dat(MT.Porcelain), 'R', OreDictToolNames.rollingpin);
85 85
 		
86 86
 		IL.Ceramic_Ingot_Mold_Raw          .set(addItem(900, "Clay Ingot Mold"          , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
87 87
 		IL.Ceramic_Chunk_Mold_Raw          .set(addItem(901, "Clay Chunk Mold"          , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
@@ -111,6 +111,7 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
111 111
 		IL.Ceramic_Sense_Mold_Raw          .set(addItem(925, "Clay Sense Mold"          , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
112 112
 		IL.Ceramic_Plow_Mold_Raw           .set(addItem(926, "Clay Plow Mold"           , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
113 113
 		IL.Ceramic_Builderwand_Mold_Raw    .set(addItem(927, "Clay Builder's Wand Mold" , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
114
+		IL.Ceramic_Nugget_Mold_Raw         .set(addItem(928, "Clay Nugget Mold"         , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
114 115
 		
115 116
 		IL.Ceramic_Tap_Raw                 .set(addItem(987, "Clay Tap"                 , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*3), TC.stack(TC.TERRA, 2), TC.stack(TC.MOTUS     , 1))); CR.shapeless(ST.make(Items.clay_ball, 3, 0), CR.DEF_NCC, new Object[] {last()});
116 117
 		IL.Ceramic_Funnel_Raw              .set(addItem(988, "Clay Funnel"              , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*3), TC.stack(TC.TERRA, 2), TC.stack(TC.MOTUS     , 1))); CR.shapeless(ST.make(Items.clay_ball, 3, 0), CR.DEF_NCC, new Object[] {last()});
@@ -124,17 +125,17 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
124 125
 		IL.Ceramic_Jug_Raw                 .set(addItem(996, "Clay Jug"                 , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*6), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS    , 1))); CR.shapeless(ST.make(Items.clay_ball, 6, 0), CR.DEF_NCC, new Object[] {last()});
125 126
 		IL.Measuring_Pot_Raw               .set(addItem(997, "Clay Measuring Pot"       , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*4), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS    , 1))); CR.shapeless(ST.make(Items.clay_ball, 4, 0), CR.DEF_NCC, new Object[] {last()});
126 127
 		
127
-		CR.shaped(IL.Ceramic_Tap_Raw     .get(1), CR.DEF_NCC    , "CCR", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
128
-		CR.shaped(IL.Ceramic_Funnel_Raw  .get(1), CR.DEF_NCC    , "CRC", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
129
-		CR.shaped(IL.Ceramic_Crucible_Raw.get(1), CR.DEF_NCC    , "CkC", "CRC", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
130
-		CR.shaped(IL.Ceramic_Basin_Raw   .get(1), CR.DEF_NCC    , "CkC", "CRC", " C ", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
131
-		CR.shaped(IL.Ceramic_Mold_Raw    .get(1), CR.DEF_NCC    , "C C", "CCC", "k R", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
132
-		CR.shaped(IL.Ceramic_Faucet_Raw  .get(1), CR.DEF_NCC    , "C C", "kCR"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
133
-		CR.shaped(IL.Ceramic_Crossing_Raw.get(1), CR.DEF_NCC    , "kCR", "CCC", " C ", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
134
-		CR.shaped(IL.Juicer_Raw          .get(1), CR.DEF_NCC    , "kCR", "CCC"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
135
-		CR.shaped(IL.Ceramic_Bowl_Raw    .get(1), CR.DEF_NCC    , "k R", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
136
-		CR.shaped(IL.Ceramic_Jug_Raw     .get(1), CR.DEF_NCC    , "kCR", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
137
-		CR.shaped(IL.Measuring_Pot_Raw   .get(1), CR.DEF_NCC    , "CkC", "CCR"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
128
+		CR.shaped(IL.Ceramic_Tap_Raw     .get(1), CR.DEF_NCC, "CCR", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
129
+		CR.shaped(IL.Ceramic_Funnel_Raw  .get(1), CR.DEF_NCC, "CRC", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
130
+		CR.shaped(IL.Ceramic_Crucible_Raw.get(1), CR.DEF_NCC, "CkC", "CRC", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
131
+		CR.shaped(IL.Ceramic_Basin_Raw   .get(1), CR.DEF_NCC, "CkC", "CRC", " C ", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
132
+		CR.shaped(IL.Ceramic_Mold_Raw    .get(1), CR.DEF_NCC, "C C", "CCC", "k R", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
133
+		CR.shaped(IL.Ceramic_Faucet_Raw  .get(1), CR.DEF_NCC, "C C", "kCR"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
134
+		CR.shaped(IL.Ceramic_Crossing_Raw.get(1), CR.DEF_NCC, "kCR", "CCC", " C ", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
135
+		CR.shaped(IL.Juicer_Raw          .get(1), CR.DEF_NCC, "kCR", "CCC"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
136
+		CR.shaped(IL.Ceramic_Bowl_Raw    .get(1), CR.DEF_NCC, "k R", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
137
+		CR.shaped(IL.Ceramic_Jug_Raw     .get(1), CR.DEF_NCC, "kCR", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
138
+		CR.shaped(IL.Measuring_Pot_Raw   .get(1), CR.DEF_NCC, "CkC", "CCR"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
138 139
 		
139 140
 		CR.shapeless(IL.Ceramic_Ingot_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.ingot.dat(MT.TECH.Brick)});
140 141
 		CR.shapeless(IL.Ceramic_Plate_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OD.paneGlass});

+ 1
- 0
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -446,6 +446,7 @@ public class Loader_MultiTileEntities implements Runnable {
446 446
 		RM.add_smelting(IL.Ceramic_Sense_Mold_Raw          .get(1), IL.Ceramic_Mold.getWithNBT(1, UT.NBT.make("gt.mold", 0b0_00000_01111_11111_00000_00000)));
447 447
 		RM.add_smelting(IL.Ceramic_Plow_Mold_Raw           .get(1), IL.Ceramic_Mold.getWithNBT(1, UT.NBT.make("gt.mold", 0b0_11111_11111_11111_11111_00100)));
448 448
 		RM.add_smelting(IL.Ceramic_Builderwand_Mold_Raw    .get(1), IL.Ceramic_Mold.getWithNBT(1, UT.NBT.make("gt.mold", 0b0_00000_00100_11111_01110_01010)));
449
+		RM.add_smelting(IL.Ceramic_Nugget_Mold_Raw         .get(1), IL.Ceramic_Mold.getWithNBT(1, UT.NBT.make("gt.mold", 0b0_00000_00000_00100_00000_00000)));
449 450
 		
450 451
 		
451 452
 		// Basins

+ 2
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Chem.java View File

@@ -312,8 +312,8 @@ public class Loader_Recipes_Chem implements Runnable {
312 312
 		RM.Distillery       .addRecipe1(T, 16,  24, ST.tag(1), FL.BiomassIC2    .make( 40), MT.Glycerol.liquid(U50, F), FL.DistW.make(20));
313 313
 		
314 314
 		
315
-		RM.DistillationTower.addRecipe0(F, 64,  16                               , FL.array(FL.Biomass       .make( 80)), FL.array(FL.Reikanol.make(20, FL.BioEthanol), MT.Glycerol.liquid(U50, F), FL.Methane.make(4), FL.DistW.make(50)), ZL_IS);
316
-		RM.DistillationTower.addRecipe0(F, 64,  16                               , FL.array(FL.BiomassIC2    .make( 80)), FL.array(FL.Reikanol.make(20, FL.BioEthanol), MT.Glycerol.liquid(U50, F), FL.Methane.make(4), FL.DistW.make(50)), ZL_IS);
315
+		RM.DistillationTower.addRecipe0(F, 64,  16, new long[] { 500,  500,  500}, FL.array(FL.Biomass       .make( 80)), FL.array(FL.Reikanol.make(20, FL.BioEthanol), MT.Glycerol.liquid(U50, F), FL.Methane.make(4), FL.DistW.make(50)), ZL_IS);
316
+		RM.DistillationTower.addRecipe0(F, 64,  16, new long[] { 500,  500,  500}, FL.array(FL.BiomassIC2    .make( 80)), FL.array(FL.Reikanol.make(20, FL.BioEthanol), MT.Glycerol.liquid(U50, F), FL.Methane.make(4), FL.DistW.make(50)), ZL_IS);
317 317
 		RM.DistillationTower.addRecipe0(F, 64, 512, new long[] {9000, 9000, 9000}, FL.array(FL.Oil_ExtraHeavy.make( 50)), FL.array(FL.Fuel.make(70), FL.Diesel.make(45), FL.Kerosine.make(40), FL.Petrol.make(35), FL.Propane.make(10), FL.Butane.make(10), FL.lube(100)), dustTiny.mat(MT.WaxParaffin, 1), dustTiny.mat(MT.Asphalt, 1), dustTiny.mat(MT.PetCoke, 1));
318 318
 		RM.DistillationTower.addRecipe0(F, 64, 384, new long[] {7000, 7000, 7000}, FL.array(FL.Oil_Heavy     .make( 50)), FL.array(FL.Fuel.make(60), FL.Diesel.make(35), FL.Kerosine.make(35), FL.Petrol.make(30), FL.Propane.make(15), FL.Butane.make(15), FL.lube( 80)), dustTiny.mat(MT.WaxParaffin, 1), dustTiny.mat(MT.Asphalt, 1), dustTiny.mat(MT.PetCoke, 1)); if (FL.Oil_Heavy2.exists())
319 319
 		RM.DistillationTower.addRecipe0(F, 64, 384, new long[] {7000, 7000, 7000}, FL.array(FL.Oil_Heavy2    .make( 50)), FL.array(FL.Fuel.make(60), FL.Diesel.make(35), FL.Kerosine.make(35), FL.Petrol.make(30), FL.Propane.make(15), FL.Butane.make(15), FL.lube( 80)), dustTiny.mat(MT.WaxParaffin, 1), dustTiny.mat(MT.Asphalt, 1), dustTiny.mat(MT.PetCoke, 1));

+ 67
- 42
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -335,8 +335,8 @@ public class Loader_Recipes_Other implements Runnable {
335 335
 		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(dust       .mat(tRock, 9), dust     .mat(tCalcite, 1), dust      .mat(tAsh, 1)), dust     .mat(MT.Concrete,11));
336 336
 		}
337 337
 		for (OreDictMaterial tIron : ANY.Iron.mToThis)
338
-		RM.Drying           .addRecipe1(T, 16,   16, stick.mat(tIron, 1) , FL.Concrete.make(L), FL.DistW.make(8), ST.make(BlocksGT.ConcreteReinforced    , 1, DYE_INDEX_LightGray));
339
-		RM.Drying           .addRecipe1(T, 16,   16, ST.tag(0)           , FL.Concrete.make(L), FL.DistW.make(8), ST.make(BlocksGT.Concrete              , 1, DYE_INDEX_LightGray));
338
+		RM.Drying           .addRecipe1(T, 16,   16, stick.mat(tIron, 1) , FL.Concrete.make(L), FL.DistW.make(8), ST.make(BlocksGT.ConcreteReinforced, 1, DYE_INDEX_LightGray));
339
+		RM.Drying           .addRecipe1(T, 16,   16, ST.tag(0)           , FL.Concrete.make(L), FL.DistW.make(8), ST.make(BlocksGT.Concrete          , 1, DYE_INDEX_LightGray));
340 340
 		
341 341
 		// Asphalt
342 342
 		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Stone, MT.Concrete, MT.Gravel, MT.Talc, MT.Rhyolite, MT.Gneiss, MT.Shale, MT.Dolomite, MT.Chert})
@@ -567,6 +567,31 @@ public class Loader_Recipes_Other implements Runnable {
567 567
 		}
568 568
 		}
569 569
 		
570
+		// Lubricant
571
+		for (OreDictMaterial tMat : new OreDictMaterial[] {MT.Talc, MT.Redstone}) {
572
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Frying    .make(1000), FL.lube(1000), ZL_IS);
573
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Sunflower .make(1000), FL.lube(1000), ZL_IS);
574
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Olive     .make(1000), FL.lube(1000), ZL_IS);
575
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Nut       .make(1000), FL.lube(1000), ZL_IS);
576
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Lin       .make(1000), FL.lube(1000), ZL_IS);
577
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Hemp      .make(1000), FL.lube(1000), ZL_IS);
578
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Fish      .make(1000), FL.lube(1000), ZL_IS);
579
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Seed      .make(1000), FL.lube(1000), ZL_IS);
580
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Plant     .make(1000), FL.lube(1000), ZL_IS);
581
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Canola    .make(1000), FL.lube(2000), ZL_IS);
582
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Creosote  .make(1000), FL.lube(2000), ZL_IS);
583
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Soulsand  .make(1000), FL.lube(3000), ZL_IS);
584
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Light     .make(1000), FL.lube(3000), ZL_IS); if (FL.Oil_Light2.exists())
585
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Light2    .make(1000), FL.lube(3000), ZL_IS);
586
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Normal    .make(1000), FL.lube(4000), ZL_IS); if (FL.Oil_HotCrude.exists())
587
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_HotCrude  .make(1000), FL.lube(4000), ZL_IS);
588
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Medium    .make(1000), FL.lube(4000), ZL_IS);
589
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Heavy     .make(1000), FL.lube(5000), ZL_IS); if (FL.Oil_Heavy2.exists())
590
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_Heavy2    .make(1000), FL.lube(5000), ZL_IS);
591
+		RM.Mixer.addRecipe1(T, 16, 16, OM.dust(tMat), FL.Oil_ExtraHeavy.make(1000), FL.lube(6000), ZL_IS);
592
+		}
593
+		
594
+		// Other
570 595
 		RM.Lightning    .addRecipe2(T, 16, 2048, ST.tag(1), gem.mat(MT.CertusQuartz, 1), gem.mat(MT.ChargedCertusQuartz, 1));
571 596
 		
572 597
 		for (byte i = 0; i < 16; i++) {
@@ -580,18 +605,18 @@ public class Loader_Recipes_Other implements Runnable {
580 605
 		
581 606
 		
582 607
 		
583
-		RM.Press        .addRecipeX(T, 16,   16, ST.array(IL.Shape_Press_Bullet_Casing_Small    .get(0), dustDiv72   .mat(MT.Gunpowder, 8), plateTiny.mat(MT.Brass, 1)), bulletGtSmall.mat(MT.Empty, 1));
584
-		RM.Press        .addRecipeX(T, 16,   32, ST.array(IL.Shape_Press_Bullet_Casing_Medium   .get(0), dustDiv72   .mat(MT.Gunpowder,16), plateTiny.mat(MT.Brass, 2)), bulletGtMedium.mat(MT.Empty, 1));
585
-		RM.Press        .addRecipeX(T, 16,   64, ST.array(IL.Shape_Press_Bullet_Casing_Large    .get(0), dustDiv72   .mat(MT.Gunpowder,24), plateTiny.mat(MT.Brass, 3)), bulletGtLarge.mat(MT.Empty, 1));
586
-		RM.Press        .addRecipeX(T, 16,   16, ST.array(IL.Shape_Press_Bullet_Casing_Small    .get(0), dustTiny    .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 1)), bulletGtSmall.mat(MT.Empty, 1));
587
-		RM.Press        .addRecipeX(T, 16,   32, ST.array(IL.Shape_Press_Bullet_Casing_Medium   .get(0), dustTiny    .mat(MT.Gunpowder, 2), plateTiny.mat(MT.Brass, 2)), bulletGtMedium.mat(MT.Empty, 1));
588
-		RM.Press        .addRecipeX(T, 16,   64, ST.array(IL.Shape_Press_Bullet_Casing_Large    .get(0), dustTiny    .mat(MT.Gunpowder, 3), plateTiny.mat(MT.Brass, 3)), bulletGtLarge.mat(MT.Empty, 1));
589
-		RM.Press        .addRecipeX(T, 16,  144, ST.array(IL.Shape_Press_Bullet_Casing_Small    .get(0), dustSmall   .mat(MT.Gunpowder, 4), plateTiny.mat(MT.Brass, 9)), bulletGtSmall.mat(MT.Empty, 9));
590
-		RM.Press        .addRecipeX(T, 16,  288, ST.array(IL.Shape_Press_Bullet_Casing_Medium   .get(0), dustSmall   .mat(MT.Gunpowder, 8), plateTiny.mat(MT.Brass,18)), bulletGtMedium.mat(MT.Empty, 9));
591
-		RM.Press        .addRecipeX(T, 16,  192, ST.array(IL.Shape_Press_Bullet_Casing_Large    .get(0), dustSmall   .mat(MT.Gunpowder, 4), plateTiny.mat(MT.Brass, 9)), bulletGtLarge.mat(MT.Empty, 3));
592
-		RM.Press        .addRecipeX(T, 16,  144, ST.array(IL.Shape_Press_Bullet_Casing_Small    .get(0), dust        .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 9)), bulletGtSmall.mat(MT.Empty, 9));
593
-		RM.Press        .addRecipeX(T, 16,  288, ST.array(IL.Shape_Press_Bullet_Casing_Medium   .get(0), dust        .mat(MT.Gunpowder, 2), plateTiny.mat(MT.Brass,18)), bulletGtMedium.mat(MT.Empty, 9));
594
-		RM.Press        .addRecipeX(T, 16,  192, ST.array(IL.Shape_Press_Bullet_Casing_Large    .get(0), dust        .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 9)), bulletGtLarge.mat(MT.Empty, 3));
608
+		RM.Press        .addRecipeX(T, 16,   16, ST.array(IL.Shape_Press_Bullet_Casing_Small .get(0), dustDiv72.mat(MT.Gunpowder, 8), plateTiny.mat(MT.Brass, 1)), bulletGtSmall .mat(MT.Empty, 1));
609
+		RM.Press        .addRecipeX(T, 16,   32, ST.array(IL.Shape_Press_Bullet_Casing_Medium.get(0), dustDiv72.mat(MT.Gunpowder,16), plateTiny.mat(MT.Brass, 2)), bulletGtMedium.mat(MT.Empty, 1));
610
+		RM.Press        .addRecipeX(T, 16,   64, ST.array(IL.Shape_Press_Bullet_Casing_Large .get(0), dustDiv72.mat(MT.Gunpowder,24), plateTiny.mat(MT.Brass, 3)), bulletGtLarge .mat(MT.Empty, 1));
611
+		RM.Press        .addRecipeX(T, 16,   16, ST.array(IL.Shape_Press_Bullet_Casing_Small .get(0), dustTiny .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 1)), bulletGtSmall .mat(MT.Empty, 1));
612
+		RM.Press        .addRecipeX(T, 16,   32, ST.array(IL.Shape_Press_Bullet_Casing_Medium.get(0), dustTiny .mat(MT.Gunpowder, 2), plateTiny.mat(MT.Brass, 2)), bulletGtMedium.mat(MT.Empty, 1));
613
+		RM.Press        .addRecipeX(T, 16,   64, ST.array(IL.Shape_Press_Bullet_Casing_Large .get(0), dustTiny .mat(MT.Gunpowder, 3), plateTiny.mat(MT.Brass, 3)), bulletGtLarge .mat(MT.Empty, 1));
614
+		RM.Press        .addRecipeX(T, 16,  144, ST.array(IL.Shape_Press_Bullet_Casing_Small .get(0), dustSmall.mat(MT.Gunpowder, 4), plateTiny.mat(MT.Brass, 9)), bulletGtSmall .mat(MT.Empty, 9));
615
+		RM.Press        .addRecipeX(T, 16,  288, ST.array(IL.Shape_Press_Bullet_Casing_Medium.get(0), dustSmall.mat(MT.Gunpowder, 8), plateTiny.mat(MT.Brass,18)), bulletGtMedium.mat(MT.Empty, 9));
616
+		RM.Press        .addRecipeX(T, 16,  192, ST.array(IL.Shape_Press_Bullet_Casing_Large .get(0), dustSmall.mat(MT.Gunpowder, 4), plateTiny.mat(MT.Brass, 9)), bulletGtLarge .mat(MT.Empty, 3));
617
+		RM.Press        .addRecipeX(T, 16,  144, ST.array(IL.Shape_Press_Bullet_Casing_Small .get(0), dust     .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 9)), bulletGtSmall .mat(MT.Empty, 9));
618
+		RM.Press        .addRecipeX(T, 16,  288, ST.array(IL.Shape_Press_Bullet_Casing_Medium.get(0), dust     .mat(MT.Gunpowder, 2), plateTiny.mat(MT.Brass,18)), bulletGtMedium.mat(MT.Empty, 9));
619
+		RM.Press        .addRecipeX(T, 16,  192, ST.array(IL.Shape_Press_Bullet_Casing_Large .get(0), dust     .mat(MT.Gunpowder, 1), plateTiny.mat(MT.Brass, 9)), bulletGtLarge .mat(MT.Empty, 3));
595 620
 		
596 621
 		
597 622
 		for (byte i = 0; i < 16; i++) {
@@ -690,34 +715,34 @@ public class Loader_Recipes_Other implements Runnable {
690 715
 		}
691 716
 		
692 717
 		for (int i = 0; i < 16; i++)
693
-		RM.Loom         .addRecipe2(T, 16,   16, ST.tag(10), plantGtFiber.mat(MT.DATA.Dye_Materials[15-i], 4), IL.Rope.get(1));
694
-		RM.Loom         .addRecipe2(T, 16,   16, ST.tag(10), plantGtFiber.mat(MT.Cu, 4), IL.Rope.get(1));
695
-		RM.Loom         .addRecipe2(T, 16,   16, ST.tag(10), ST.make(Items.string, 4, W), IL.Rope_Silk.get(1));
696
-		
697
-		RM.CokeOven     .addRecipe1(T,  0,  3600, nugget                    .mat(MT.Coal    , 9), NF, MT.Creosote   .liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
698
-		RM.CokeOven     .addRecipe1(T,  0,  3600, chunkGt                   .mat(MT.Coal    , 4), NF, MT.Creosote   .liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
699
-		RM.CokeOven     .addRecipe1(T,  0,  3600, ingot                     .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
700
-		RM.CokeOven     .addRecipe1(T,  0,  3600, gem                       .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid(   U2, F), gem       .mat(MT.CoalCoke, 1));
701
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedPurified           .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
702
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedPurifiedTiny       .mat(MT.Coal    , 9), NF, MT.Creosote   .liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
703
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedCentrifuged        .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
704
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedCentrifugedTiny    .mat(MT.Coal    , 9), NF, MT.Creosote   .liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
705
-		RM.CokeOven     .addRecipe1(T,  0, 32400, blockGem                  .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid( 9*U2, F), blockGem  .mat(MT.CoalCoke, 1));
706
-		RM.CokeOven     .addRecipe1(T,  0, 32400, blockIngot                .mat(MT.Coal    , 1), NF, MT.Creosote   .liquid( 9*U2, F), blockIngot.mat(MT.CoalCoke, 1));
707
-		
708
-		RM.CokeOven     .addRecipe1(T,  0,  3600, nugget                    .mat(MT.Lignite , 9), NF, MT.Creosote   .liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
709
-		RM.CokeOven     .addRecipe1(T,  0,  3600, chunkGt                   .mat(MT.Lignite , 4), NF, MT.Creosote   .liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
710
-		RM.CokeOven     .addRecipe1(T,  0,  3600, ingot                     .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
711
-		RM.CokeOven     .addRecipe1(T,  0,  3600, gem                       .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid( 3*U4, F), gem       .mat(MT.LigniteCoke, 1));
712
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedPurified           .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
713
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedPurifiedTiny       .mat(MT.Lignite , 9), NF, MT.Creosote   .liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
714
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedCentrifuged        .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
715
-		RM.CokeOven     .addRecipe1(T,  0,  3600, crushedCentrifugedTiny    .mat(MT.Lignite , 9), NF, MT.Creosote   .liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
716
-		RM.CokeOven     .addRecipe1(T,  0, 32400, blockGem                  .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid(27*U4, F), blockGem  .mat(MT.LigniteCoke, 1));
717
-		RM.CokeOven     .addRecipe1(T,  0, 32400, blockIngot                .mat(MT.Lignite , 1), NF, MT.Creosote   .liquid(27*U4, F), blockIngot.mat(MT.LigniteCoke, 1));
718
-		
719
-		RM.CokeOven     .addRecipe1(T,  0,  3600, dust                      .mat(MT.Oilshale, 1), NF, MT.Oil        .liquid(  U40, F), dustTiny .mat(MT.Asphalt, 1));
720
-		RM.CokeOven     .addRecipe1(T,  0, 32400, blockDust                 .mat(MT.Oilshale, 1), NF, MT.Oil        .liquid(9*U40, F), dust     .mat(MT.Asphalt, 1));
718
+		RM.Loom    .addRecipe2(T, 16,   16, ST.tag(10), plantGtFiber.mat(MT.DATA.Dye_Materials[15-i], 4), IL.Rope.get(1));
719
+		RM.Loom    .addRecipe2(T, 16,   16, ST.tag(10), plantGtFiber.mat(MT.Cu, 4), IL.Rope.get(1));
720
+		RM.Loom    .addRecipe2(T, 16,   16, ST.tag(10), ST.make(Items.string, 4, W), IL.Rope_Silk.get(1));
721
+		
722
+		RM.CokeOven.addRecipe1(T,  0,  3600, nugget                .mat(MT.Coal    , 9), NF, MT.Creosote.liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
723
+		RM.CokeOven.addRecipe1(T,  0,  3600, chunkGt               .mat(MT.Coal    , 4), NF, MT.Creosote.liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
724
+		RM.CokeOven.addRecipe1(T,  0,  3600, ingot                 .mat(MT.Coal    , 1), NF, MT.Creosote.liquid(   U2, F), ingot     .mat(MT.CoalCoke, 1));
725
+		RM.CokeOven.addRecipe1(T,  0,  3600, gem                   .mat(MT.Coal    , 1), NF, MT.Creosote.liquid(   U2, F), gem       .mat(MT.CoalCoke, 1));
726
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedPurified       .mat(MT.Coal    , 1), NF, MT.Creosote.liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
727
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedPurifiedTiny   .mat(MT.Coal    , 9), NF, MT.Creosote.liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
728
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedCentrifuged    .mat(MT.Coal    , 1), NF, MT.Creosote.liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
729
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedCentrifugedTiny.mat(MT.Coal    , 9), NF, MT.Creosote.liquid(   U2, F), chunkGt   .mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1), chunkGt.mat(MT.CoalCoke, 1));
730
+		RM.CokeOven.addRecipe1(T,  0, 32400, blockGem              .mat(MT.Coal    , 1), NF, MT.Creosote.liquid( 9*U2, F), blockGem  .mat(MT.CoalCoke, 1));
731
+		RM.CokeOven.addRecipe1(T,  0, 32400, blockIngot            .mat(MT.Coal    , 1), NF, MT.Creosote.liquid( 9*U2, F), blockIngot.mat(MT.CoalCoke, 1));
732
+		
733
+		RM.CokeOven.addRecipe1(T,  0,  3600, nugget                .mat(MT.Lignite , 9), NF, MT.Creosote.liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
734
+		RM.CokeOven.addRecipe1(T,  0,  3600, chunkGt               .mat(MT.Lignite , 4), NF, MT.Creosote.liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
735
+		RM.CokeOven.addRecipe1(T,  0,  3600, ingot                 .mat(MT.Lignite , 1), NF, MT.Creosote.liquid( 3*U4, F), ingot     .mat(MT.LigniteCoke, 1));
736
+		RM.CokeOven.addRecipe1(T,  0,  3600, gem                   .mat(MT.Lignite , 1), NF, MT.Creosote.liquid( 3*U4, F), gem       .mat(MT.LigniteCoke, 1));
737
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedPurified       .mat(MT.Lignite , 1), NF, MT.Creosote.liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
738
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedPurifiedTiny   .mat(MT.Lignite , 9), NF, MT.Creosote.liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
739
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedCentrifuged    .mat(MT.Lignite , 1), NF, MT.Creosote.liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
740
+		RM.CokeOven.addRecipe1(T,  0,  3600, crushedCentrifugedTiny.mat(MT.Lignite , 9), NF, MT.Creosote.liquid( 3*U4, F), chunkGt   .mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1), chunkGt.mat(MT.LigniteCoke, 1));
741
+		RM.CokeOven.addRecipe1(T,  0, 32400, blockGem              .mat(MT.Lignite , 1), NF, MT.Creosote.liquid(27*U4, F), blockGem  .mat(MT.LigniteCoke, 1));
742
+		RM.CokeOven.addRecipe1(T,  0, 32400, blockIngot            .mat(MT.Lignite , 1), NF, MT.Creosote.liquid(27*U4, F), blockIngot.mat(MT.LigniteCoke, 1));
743
+		
744
+		RM.CokeOven.addRecipe1(T,  0,  3600, dust                  .mat(MT.Oilshale, 1), NF, MT.Oil     .liquid(  U40, F), dustTiny  .mat(MT.Asphalt, 1));
745
+		RM.CokeOven.addRecipe1(T,  0, 32400, blockDust             .mat(MT.Oilshale, 1), NF, MT.Oil     .liquid(9*U40, F), dust      .mat(MT.Asphalt, 1));
721 746
 		
722 747
 		
723 748
 		RM.Nanofab.addRecipe2(T, 16,  64, ST.tag( 0), dustDiv72.mat(MT.C,18), foil.mat(MT.Graphene, 1));

+ 58
- 89
src/main/java/gregtech/old/Loader_MachineRecipes.java View File

@@ -32,124 +32,93 @@ import gregapi.util.ST;
32 32
 import net.minecraft.init.Blocks;
33 33
 import net.minecraft.init.Items;
34 34
 import net.minecraft.item.ItemStack;
35
-import net.minecraftforge.fluids.FluidRegistry;
36 35
 
37 36
 @SuppressWarnings("deprecation")
38 37
 public class Loader_MachineRecipes implements Runnable {
39 38
 	@Override
40 39
 	public void run() {
41 40
 		gregapi.old.IGT_RecipeAdder RA = gregapi.old.IGT_RecipeAdder.NON_WORKING;
42
-
41
+		
43 42
 //      RA.addPrinterRecipe(OM.get(OP.plateDouble, MT.Paper, 1), UT.Fluids.make("squidink", (int)L / 4), NI, IL.Paper_Punch_Card_Empty.get(1), 100, 2);
44 43
 //      RA.addPrinterRecipe(IL.Paper_Punch_Card_Empty.get(1), UT.Fluids.make("squidink", (int)L / 4), IL.Tool_DataStick.getWithName(0, "With Punch Card Data"), IL.Paper_Punch_Card_Encoded.get(1), 100, 2);
45
-
46
-//      RA.addFormingPressRecipe(ST.make(Blocks.glass, 1, W), IL.Shape_Mold_Arrow.get(0), IL.Arrow_Head_Glass_Emtpy .get(1),  64,   4);
47
-
44
+		
45
+//      RA.addFormingPressRecipe(ST.make(Blocks.glass, 1, W), IL.Shape_Mold_Arrow.get(0), IL.Arrow_Head_Glass_Emtpy.get(1), 64, 4);
46
+		
48 47
 //      for (OreDictMaterial tMat : MT.VALUES) if (tMat.mStandardMoltenFluid != null && tMat.contains(SubTag.SOLDERING_MATERIAL)) {
49 48
 //          int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : 2;
50 49
 //          for (ItemStack tPlate : ST.array(OM.get(OP.plate, MT.Fe, 1), OM.get(OP.plate, MT.WroughtIron, 1), OM.get(OP.plate, MT.Al, 1)}) {
51
-//              RA.addAssemblerRecipe(ST.make(Blocks.lever                          , 1, W) , tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_Controller.get(1)         , 800, 16);
52
-//              RA.addAssemblerRecipe(ST.make(Blocks.redstone_torch                 , 1, W) , tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_ActivityDetector.get(1)       , 800, 16);
53
-//              RA.addAssemblerRecipe(ST.make(Blocks.heavy_weighted_pressure_plate  , 1, W) , tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_FluidDetector.get(1)      , 800, 16);
54
-//              RA.addAssemblerRecipe(ST.make(Blocks.light_weighted_pressure_plate  , 1, W) , tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_ItemDetector.get(1)           , 800, 16);
55
-//              RA.addAssemblerRecipe(ST.makeIC2("ecMeter"                  , 1)    , tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_EnergyDetector.get(1)     , 800, 16);
50
+//              RA.addAssemblerRecipe(ST.make(Blocks.lever                        , 1, W), tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_Controller.get(1)      , 800, 16);
51
+//              RA.addAssemblerRecipe(ST.make(Blocks.redstone_torch               , 1, W), tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_ActivityDetector.get(1), 800, 16);
52
+//              RA.addAssemblerRecipe(ST.make(Blocks.heavy_weighted_pressure_plate, 1, W), tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_FluidDetector.get(1)   , 800, 16);
53
+//              RA.addAssemblerRecipe(ST.make(Blocks.light_weighted_pressure_plate, 1, W), tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_ItemDetector.get(1)    , 800, 16);
54
+//              RA.addAssemblerRecipe(ST.makeIC2("ecMeter"                        , 1   ), tPlate, tMat.getMolten((L * tMultiplier) / 2), IL.Cover_EnergyDetector.get(1)  , 800, 16);
56 55
 //          }
57 56
 //      }
58
-
59
-//      RA.addAssemblerRecipe(ST.make(Blocks.redstone_torch, 2, W)                                          , OM.get(OP.dust, MT.Redstone, 1)       , MT.Concrete.getMolten(L)      , ST.make(Items.repeater, 1, 0)                                         , 800,    1);
60
-//      RA.addAssemblerRecipe(ST.make(Items.leather, 1, W)                                                  , ST.make(Items.lead, 1, W)                                     , MT.Glue.getFluid( 50)         , ST.make(Items.name_tag, 1, 0)                                         , 100,    8);
61
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Paper, 8)                     , ST.make(Items.compass, 1, W)                                  , NF                                    , ST.make(Items.map, 1, 0)                                              , 100,    8);
62
-//      RA.addAssemblerRecipe(ST.make(MD.FR, "sturdyMachine", 1, 0)                         , OM.get(OP.gem, MT.Diamond, 4)     , MT.Water.getFluid(5000)       , IL.FR_Casing_Hardened.get(1)                                          ,  64,   32);
63
-		RA.addAssemblerRecipe(OM.get(OP.ingot, MT.Bronze, 8)                        , ST.tag(8)                     , NF                                    , IL.FR_Casing_Sturdy.get(1)                                                ,  32,   16);
64
-//      RA.addAssemblerRecipe(OM.get(OP.stick, MT.Wood, 1)                      , ST.make(Blocks.wool, 1, W)                                        , MT.Creosote.getFluid(1000)        , ST.make(Blocks.torch                                      ,  6,    0) , 400,    1);
65
-//      RA.addAssemblerRecipe(OM.get(OP.plate, MT.Rubber, 3)                        , ST.makeIC2("carbonMesh", 3)                               , MT.Glue.getFluid(300)         , IL.Duct_Tape.get(1)                                                       , 100,   64);
66
-//      RA.addAssemblerRecipe(OM.get(OP.plate, MT.Paper, 3)                     , ST.make(Items.leather, 1, W)                                  , MT.Glue.getFluid( 20)         , ST.make(Items.book, 1, 0)                                             ,  32,    8);
67
-//      RA.addAssemblerRecipe(IL.Paper_Printed_Pages.get(1)  , ST.make(Items.leather, 1, W)                                  , MT.Glue.getFluid( 20)         , ST.make(Items.written_book, 1, 0)                                     ,  32,    8);
68
-//      RA.addAssemblerRecipe(IL.Food_Baked_Cake.get(1)      , ST.make(Items.egg, 1, 0)                                      , MT.Milk.getFluid(3000)            , ST.make(Items.cake, 1, 0)                                             , 100,    8);
69
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , ST.tag(2)                     , NF                                    , IL.Food_Buns_Sliced.get(1)                                                , 100,    4);
70
-		RA.addAssemblerRecipe(IL.Food_Bread_Sliced.get(2)    , ST.tag(2)                     , NF                                    , IL.Food_Breads_Sliced.get(1)                                          , 100,    4);
71
-		RA.addAssemblerRecipe(IL.Food_Baguette_Sliced.get(2) , ST.tag(2)                     , NF                                    , IL.Food_Baguettes_Sliced.get(1)                                           , 100,    4);
72
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , ST.tag(1)                     , NF                                    , IL.Food_Bun_Sliced.get(2)                                             , 100,    4);
73
-		RA.addAssemblerRecipe(IL.Food_Breads_Sliced.get(1)   , ST.tag(1)                     , NF                                    , IL.Food_Bread_Sliced.get(2)                                               , 100,    4);
74
-		RA.addAssemblerRecipe(IL.Food_Baguettes_Sliced.get(1), ST.tag(1)                     , NF                                    , IL.Food_Baguette_Sliced.get(2)                                            , 100,    4);
75
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , OM.get(OP.ingot, MT.MeatCooked, 1)    , NF                                    , IL.Food_Burger_Meat.get(1)                                                , 100,    4);
76
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , OM.get(OP.ingot, MT.MeatCooked, 1)    , NF                                    , IL.Food_Burger_Meat.get(1)                                                , 100,    4);
77
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , OM.get(OP.ingot, MT.Tofu, 1)  , NF                                    , IL.Food_Burger_Tofu.get(1)                                                , 100,    4);
78
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , OM.get(OP.ingot, MT.Tofu, 1)  , NF                                    , IL.Food_Burger_Tofu.get(1)                                                , 100,    4);
79
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , OM.get(OP.ingot, MT.SoylentGreen, 1)  , NF                                    , IL.Food_Burger_Soylent.get(1)                                             , 100,    4);
80
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , OM.get(OP.ingot, MT.SoylentGreen, 1)  , NF                                    , IL.Food_Burger_Soylent.get(1)                                             , 100,    4);
81
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , IL.Food_Chum.get(1)                                               , NF                                    , IL.Food_Burger_Chum.get(1)                                                , 100,    4);
82
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , IL.Food_Chum.get(1)                                               , NF                                    , IL.Food_Burger_Chum.get(1)                                                , 100,    4);
83
-		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)      , IL.Food_Cheese_Sliced.get(3)                                  , NF                                    , IL.Food_Burger_Cheese.get(1)                                          , 100,    4);
84
-		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)     , IL.Food_Cheese_Sliced.get(3)                                  , NF                                    , IL.Food_Burger_Cheese.get(1)                                          , 100,    4);
85
-		RA.addAssemblerRecipe(IL.Food_Dough_Flat.get(1)      , OM.get(OP.dust, MT.MeatCooked, 1) , NF                                    , IL.Food_Pizza_Meat_Raw.get(1)                                         , 100,    4);
86
-		RA.addAssemblerRecipe(IL.Food_Dough_Flat.get(1)      , IL.Food_Cheese_Sliced.get(3)                                  , NF                                    , IL.Food_Pizza_Cheese_Raw.get(1)                                           , 100,    4);
87
-
88
-
89
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("oil")     , FluidRegistry.getFluid("lubricant"), F);
90
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("oil")     , FluidRegistry.getFluid("lubricant"), F);
91
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("creosote"), FluidRegistry.getFluid("lubricant"), F);
92
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("creosote"), FluidRegistry.getFluid("lubricant"), F);
93
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("seedoil") , FluidRegistry.getFluid("lubricant"), F);
94
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("seedoil") , FluidRegistry.getFluid("lubricant"), F);
95
-
96
-
57
+		
58
+//      RA.addAssemblerRecipe(ST.make(Blocks.redstone_torch, 2, W) , OM.get(OP.dust, MT.Redstone, 1)     , MT.Concrete.getMolten(L)  , ST.make(Items.repeater, 1, 0)    , 800,  1);
59
+//      RA.addAssemblerRecipe(ST.make(Items.leather, 1, W)         , ST.make(Items.lead, 1, W)           , MT.Glue.getFluid( 50)     , ST.make(Items.name_tag, 1, 0)    , 100,  8);
60
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Paper, 8)        , ST.make(Items.compass, 1, W)        , NF                        , ST.make(Items.map, 1, 0)         , 100,  8);
61
+//      RA.addAssemblerRecipe(ST.make(MD.FR, "sturdyMachine", 1, 0), OM.get(OP.gem, MT.Diamond, 4)       , MT.Water.getFluid(5000)   , IL.FR_Casing_Hardened.get(1)     ,  64, 32);
62
+		RA.addAssemblerRecipe(OM.get(OP.ingot, MT.Bronze, 8)       , ST.tag(8)                           , NF                        , IL.FR_Casing_Sturdy.get(1)       ,  32, 16);
63
+//      RA.addAssemblerRecipe(OM.get(OP.stick, MT.Wood, 1)         , ST.make(Blocks.wool, 1, W)          , MT.Creosote.getFluid(1000), ST.make(Blocks.torch, 6, 0)      , 400,  1);
64
+//      RA.addAssemblerRecipe(OM.get(OP.plate, MT.Rubber, 3)       , ST.makeIC2("carbonMesh", 3)         , MT.Glue.getFluid(300)     , IL.Duct_Tape.get(1)              , 100, 64);
65
+//      RA.addAssemblerRecipe(OM.get(OP.plate, MT.Paper, 3)        , ST.make(Items.leather, 1, W)        , MT.Glue.getFluid( 20)     , ST.make(Items.book, 1, 0)        ,  32,  8);
66
+//      RA.addAssemblerRecipe(IL.Paper_Printed_Pages.get(1)        , ST.make(Items.leather, 1, W)        , MT.Glue.getFluid( 20)     , ST.make(Items.written_book, 1, 0),  32,  8);
67
+//      RA.addAssemblerRecipe(IL.Food_Baked_Cake.get(1)            , ST.make(Items.egg, 1, 0)            , MT.Milk.getFluid(3000)    , ST.make(Items.cake, 1, 0)        , 100,  8);
68
+		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)            , OM.get(OP.ingot, MT.MeatCooked, 1)  , NF                        , IL.Food_Burger_Meat.get(1)       , 100,  4);
69
+		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)           , OM.get(OP.ingot, MT.MeatCooked, 1)  , NF                        , IL.Food_Burger_Meat.get(1)       , 100,  4);
70
+		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)            , OM.get(OP.ingot, MT.Tofu, 1)        , NF                        , IL.Food_Burger_Tofu.get(1)       , 100,  4);
71
+		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)           , OM.get(OP.ingot, MT.Tofu, 1)        , NF                        , IL.Food_Burger_Tofu.get(1)       , 100,  4);
72
+		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)            , OM.get(OP.ingot, MT.SoylentGreen, 1), NF                        , IL.Food_Burger_Soylent.get(1)    , 100,  4);
73
+		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)           , OM.get(OP.ingot, MT.SoylentGreen, 1), NF                        , IL.Food_Burger_Soylent.get(1)    , 100,  4);
74
+		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)            , IL.Food_Chum.get(1)                 , NF                        , IL.Food_Burger_Chum.get(1)       , 100,  4);
75
+		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)           , IL.Food_Chum.get(1)                 , NF                        , IL.Food_Burger_Chum.get(1)       , 100,  4);
76
+		RA.addAssemblerRecipe(IL.Food_Bun_Sliced.get(2)            , IL.Food_Cheese_Sliced.get(3)        , NF                        , IL.Food_Burger_Cheese.get(1)     , 100,  4);
77
+		RA.addAssemblerRecipe(IL.Food_Buns_Sliced.get(1)           , IL.Food_Cheese_Sliced.get(3)        , NF                        , IL.Food_Burger_Cheese.get(1)     , 100,  4);
78
+		RA.addAssemblerRecipe(IL.Food_Dough_Flat.get(1)            , OM.get(OP.dust, MT.MeatCooked, 1)   , NF                        , IL.Food_Pizza_Meat_Raw.get(1)    , 100,  4);
79
+		RA.addAssemblerRecipe(IL.Food_Dough_Flat.get(1)            , IL.Food_Cheese_Sliced.get(3)        , NF                        , IL.Food_Pizza_Cheese_Raw.get(1)  , 100,  4);
80
+		
81
+		
97 82
 //      RM.pulverizing(ST.make(Items.item_frame, 1, W), ST.make(Items.leather, 1), OM.dust(MT.Wood, OP.stick.mMaterialAmount * 4), 95, F);
98 83
 //      RM.pulverizing(ST.make(Items.bow, 1, 0), ST.make(Items.string, 3), OM.dust(MT.Wood, OP.stick.mMaterialAmount * 3), 95, F);
99
-
84
+		
100 85
 //      RA.addCannerRecipe(OM.get(OP.cell, Materials.Nitrogen, 16), ItemList.Spray_Empty.get(1), ItemList.Spray_Ice.get(1), ItemList.Cell_Empty.get(16), 1600, 2);
101
-
102
-//      RA.addFusionReactorRecipe(OM.get(OP.cell, MT.D  , 1), OM.get(OP.cell, MT.T      , 1), OM.get(OP.cellPlasma, MT.He, 1), 128, -4096, 40000000);
103
-//      RA.addFusionReactorRecipe(OM.get(OP.cell, MT.D  , 1), OM.get(OP.cell, MT.He_3   , 1), OM.get(OP.cellPlasma, MT.He, 1), 128, -2048, 60000000);
104
-//      RA.addFusionReactorRecipe(OM.get(OP.cell, MT.Li , 1), OM.get(OP.cell, MT.W      , 1), OM.get(OP.dust, MT.Ir, 1), 512, -32768, 150000000);
105
-//      RA.addFusionReactorRecipe(OM.get(OP.cell, MT.Be , 1), OM.get(OP.cell, MT.W      , 1), OM.get(OP.dust, MT.Pt, 1), 512, -32768, 100000000);
106
-
107
-		RA.addImplosionRecipe(IL.IC2_Compressed_Coal_Chunk.get(1), 8, OP.gem.mat(MT.DiamondIndustrial, 1), OM.get(OP.dustTiny, MT.Ash, 4));
108
-
109
-//      RA.addDistillationRecipe(OM.get(OP.cell, MT.Oil     , 16), 32, OM.get(OP.cell, MT.Fuel, 16), OM.get(OP.cell, MT.SulfuricAcid, 16), OM.get(OP.cell, MT.Glyceryl, 1), OM.get(OP.cell, MT.Methane, 15), 4000, 64);
110
-//      RA.addDistillationRecipe(OM.get(OP.cell, MT.Biomass ,  3), 0, OM.get(OP.cell, MT.Ethanol, 1), OM.get(OP.cell, MT.Water, 1), IL.Cell_Empty.get(1), IL.IC2_Fertilizer.get(1), 500, 64);
111
-
112
-//      RA.addChemicalRecipe(OM.get(OP.dust, MT.Sn          , 1), OM.get(OP.dust, MT.Saltpeter  , 1), MT.Glass.getMolten(L * 6)     , NF                                            , ST.make(MD.RC, "tile.railcraft.glass", 6)         ,   50);
113
-
86
+		
87
+//      RA.addChemicalRecipe(OM.get(OP.dust, MT.Sn, 1), OM.get(OP.dust, MT.Saltpeter, 1), MT.Glass.getMolten(L * 6), NF, ST.make(MD.RC, "tile.railcraft.glass", 6),   50);
88
+		
114 89
 		RA.addVacuumFreezerRecipe(ST.mkic("reactorCoolantSimple", 1, W), ST.mkic("reactorCoolantSimple", 1), 100);
115 90
 		RA.addVacuumFreezerRecipe(ST.mkic("reactorCoolantTriple", 1, W), ST.mkic("reactorCoolantTriple", 1), 300);
116 91
 		RA.addVacuumFreezerRecipe(ST.mkic("reactorCoolantSix"   , 1, W), ST.mkic("reactorCoolantSix"   , 1), 600);
117
-
92
+		
118 93
 		if (!ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", F))
119 94
 		RA.addAssemblerRecipe(IL.Stick.get(1), ST.make(Items.coal, 1, W), IL.Torch.get(4), 400, 1);
120 95
 		RA.addAssemblerRecipe(IL.Stick.get(3), ST.tag(3), ST.make(Blocks.fence, 1, 0), 300, 4);
121 96
 		RA.addAssemblerRecipe(IL.Stick.get(2), OM.get(OP.ring, MT.Fe, 2), ST.make(Blocks.tripwire_hook, 1, 0), 400, 4);
122 97
 		RA.addAssemblerRecipe(IL.Stick.get(2), OM.get(OP.ring, MT.WroughtIron, 2), ST.make(Blocks.tripwire_hook, 1, 0), 400, 4);
123 98
 		RA.addAssemblerRecipe(IL.Stick.get(3), ST.make(Items.string, 3, W), ST.make(Items.bow, 1, 0), 400, 4);
124
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Au            , 2), ST.tag(2), ST.make(Blocks.light_weighted_pressure_plate, 1, 0), 200, 4);
125
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe            , 2), ST.tag(2), ST.make(Blocks.heavy_weighted_pressure_plate, 1, 0), 200, 4);
126
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe            , 6), ST.tag(6), ST.make(Items.iron_door, 1, 0), 600, 4);
127
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe            , 7), ST.tag(7), ST.make(Items.cauldron, 1, 0), 700, 4);
128
-		RA.addAssemblerRecipe(OM.get(OP.stick, MT.Fe            , 1), ST.tag(1), ST.mkic("ironFence", 1), 100, 4);
129
-		RA.addAssemblerRecipe(OM.get(OP.stick, MT.Fe            , 3), ST.tag(3), ST.make(Blocks.iron_bars, 4, 0), 300, 4);
130
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron   , 2), ST.tag(2), ST.make(Blocks.heavy_weighted_pressure_plate, 1, 0), 200, 4);
131
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron   , 6), ST.tag(6), ST.make(Items.iron_door, 1, 0), 600, 4);
132
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron   , 7), ST.tag(7), ST.make(Items.cauldron, 1, 0), 700, 4);
133
-		RA.addAssemblerRecipe(OM.get(OP.stick, MT.WroughtIron   , 1), ST.tag(1), ST.mkic("ironFence", 1), 100, 4);
134
-		RA.addAssemblerRecipe(OM.get(OP.stick, MT.WroughtIron   , 3), ST.tag(3), ST.make(Blocks.iron_bars, 4, 0), 300, 4);
135
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe            , 3), OM.get(OP.minecartWheels, MT.Fe           , 2), ST.make(Items.minecart, 1, 0), 500, 2);
136
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron   , 3), OM.get(OP.minecartWheels, MT.WroughtIron  , 2), ST.make(Items.minecart, 1, 0), 400, 2);
137
-		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Steel         , 3), OM.get(OP.minecartWheels, MT.Steel        , 2), ST.make(Items.minecart, 1, 0), 300, 2);
138
-		RA.addAssemblerRecipe(ST.make(Items.minecart, 1, 0), ST.make(Blocks.hopper          , 1, W), ST.make(Items.hopper_minecart  , 1, 0), 400, 4);
139
-		RA.addAssemblerRecipe(ST.make(Items.minecart, 1, 0), ST.make(Blocks.tnt         , 1, W), ST.make(Items.tnt_minecart     , 1, 0), 400, 4);
140
-		RA.addAssemblerRecipe(ST.make(Items.minecart, 1, 0), ST.make(Blocks.chest           , 1, W), ST.make(Items.chest_minecart       , 1, 0), 400, 4);
141
-		RA.addAssemblerRecipe(ST.make(Items.minecart, 1, 0), ST.make(Blocks.trapped_chest   , 1, W), ST.make(Items.chest_minecart       , 1, 0), 400, 4);
142
-		RA.addAssemblerRecipe(ST.make(Items.minecart, 1, 0), ST.make(Blocks.furnace     , 1, W), ST.make(Items.furnace_minecart , 1, 0), 400, 4);
99
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Au         , 2), ST.tag(2), ST.make(Blocks.light_weighted_pressure_plate, 1, 0), 200, 4);
100
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe         , 2), ST.tag(2), ST.make(Blocks.heavy_weighted_pressure_plate, 1, 0), 200, 4);
101
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe         , 6), ST.tag(6), ST.make(Items.iron_door, 1, 0), 600, 4);
102
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe         , 7), ST.tag(7), ST.make(Items.cauldron, 1, 0), 700, 4);
103
+		RA.addAssemblerRecipe(OM.get(OP.stick, MT.Fe         , 1), ST.tag(1), ST.mkic("ironFence", 1), 100, 4);
104
+		RA.addAssemblerRecipe(OM.get(OP.stick, MT.Fe         , 3), ST.tag(3), ST.make(Blocks.iron_bars, 4, 0), 300, 4);
105
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron, 2), ST.tag(2), ST.make(Blocks.heavy_weighted_pressure_plate, 1, 0), 200, 4);
106
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron, 6), ST.tag(6), ST.make(Items.iron_door, 1, 0), 600, 4);
107
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron, 7), ST.tag(7), ST.make(Items.cauldron, 1, 0), 700, 4);
108
+		RA.addAssemblerRecipe(OM.get(OP.stick, MT.WroughtIron, 1), ST.tag(1), ST.mkic("ironFence", 1), 100, 4);
109
+		RA.addAssemblerRecipe(OM.get(OP.stick, MT.WroughtIron, 3), ST.tag(3), ST.make(Blocks.iron_bars, 4, 0), 300, 4);
110
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Fe         , 3), OM.get(OP.minecartWheels, MT.Fe         , 2), ST.make(Items.minecart, 1, 0), 500, 2);
111
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.WroughtIron, 3), OM.get(OP.minecartWheels, MT.WroughtIron, 2), ST.make(Items.minecart, 1, 0), 400, 2);
112
+		RA.addAssemblerRecipe(OM.get(OP.plate, MT.Steel      , 3), OM.get(OP.minecartWheels, MT.Steel      , 2), ST.make(Items.minecart, 1, 0), 300, 2);
143 113
 		RA.addAssemblerRecipe(ST.make(Blocks.tripwire_hook, 1, 0), ST.make(Blocks.chest, 1, W), ST.make(Blocks.trapped_chest, 1, 0), 200, 4);
144
-		RA.addAssemblerRecipe(ST.make(Blocks.stone              , 1, 0), ST.tag(4), ST.make(Blocks.stonebrick   , 1, 0),  50, 4);
145
-		RA.addAssemblerRecipe(ST.make(Blocks.sandstone          , 1, 0), ST.tag(1), ST.make(Blocks.sandstone    , 1, 2),  50, 4);
146
-		RA.addAssemblerRecipe(ST.make(Blocks.sandstone          , 1, 1), ST.tag(1), ST.make(Blocks.sandstone    , 1, 0),  50, 4);
147
-		RA.addAssemblerRecipe(ST.make(Blocks.sandstone          , 1, 2), ST.tag(1), ST.make(Blocks.sandstone    , 1, 0),  50, 4);
148
-		RA.addAssemblerRecipe(ST.mkic("waterMill", 2), ST.tag(2), ST.mkic("generator", 1), 6400, 8);
114
+		RA.addAssemblerRecipe(ST.make(Blocks.stone    , 1, 0), ST.tag(4), ST.make(Blocks.stonebrick, 1, 0),  50, 4);
115
+		RA.addAssemblerRecipe(ST.make(Blocks.sandstone, 1, 0), ST.tag(1), ST.make(Blocks.sandstone , 1, 2),  50, 4);
116
+		RA.addAssemblerRecipe(ST.make(Blocks.sandstone, 1, 1), ST.tag(1), ST.make(Blocks.sandstone , 1, 0),  50, 4);
117
+		RA.addAssemblerRecipe(ST.make(Blocks.sandstone, 1, 2), ST.tag(1), ST.make(Blocks.sandstone , 1, 0),  50, 4);
149 118
 		RA.addAssemblerRecipe(ST.mkic("batPack", 1, W), ST.tag(1), IL.IC2_ReBattery.get(6), 800, 4);
150 119
 		RA.addAssemblerRecipe(ST.make(Blocks.stone_slab, 3, 0), IL.RC_Rebar.get(1), IL.RC_Tie_Stone.get(1), 128, 8);
151 120
 		RA.addAssemblerRecipe(ST.make(Blocks.stone_slab, 3, 7), IL.RC_Rebar.get(1), IL.RC_Tie_Stone.get(1), 128, 8);
152
-		RA.addAssemblerRecipe(OM.get(OP.wireGt01, MT.Cu, 9), OM.get(OP.plate, MT.Pb, 2), NF, IL.RC_ShuntingWire.get(4), 1600, 4);
121
+		RA.addAssemblerRecipe(OM.get(OP.wireGt01, MT.Cu            , 9), OM.get(OP.plate, MT.Pb, 2), NF, IL.RC_ShuntingWire.get(4), 1600, 4);
153 122
 		RA.addAssemblerRecipe(OM.get(OP.wireGt01, MT.AnnealedCopper, 9), OM.get(OP.plate, MT.Pb, 2), NF, IL.RC_ShuntingWire.get(4), 1600, 4);
154 123
 		
155 124
 		for (ItemStack tRail : ST.array(IL.RC_Rail_Standard.get(6), IL.RC_Rail_Adv.get(6), IL.RC_Rail_Reinforced.get(6), IL.RC_Rail_Electric.get(6), IL.RC_Rail_HS.get(6), IL.RC_Rail_Wooden.get(6))) {

BIN
src/main/resources/assets/gregtech/textures/items/gt.multiitem.randomtools/928.png View File


Loading…
Cancel
Save