Browse Source

Signalum Sterling Silver Issue should be fixed now

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

+ 1
- 1
CHANGELOG.md View File

@@ -23,7 +23,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
23 23
 [CHANGED] Barrels and Drums did not have the same Melting Points that Pipes have. I fixed that. Metal Drums now have 1.25 times more Heat Resistance, while Wooden Barrels and Plastic Cans got a properly assigned fixed Value, which in most cases should not make them burn up.
24 24
 [CHANGED] Blue Steel is Red Steel now and vice versa. This should fix my ages old fuckup of the Recipes. Everything should still be the same as before when it comes to Stats, just the Color of the Material changed. If you used Matter Fabricators to make Red/Blue Steel for some reason, you may need to check the USB Stick with the Recipe.
25 25
 [CHANGED] Oil and Natural Gas can now pass through Water. In the case of Oil this will result in Buildcraft alike Oil Fountains or puddles in the Ocean, should you be super lucky. If not, just dig a tunnel down and it happens too. XD
26
-[ADDED] In a potentially failing attempt of fixing the Nichrome Issue in Stainless Steel, I added a Version of the Recipe that takes Nichrome instead of Invar, which is ofcourse in the proper ratios. I do not know how well that will work for people using the Crucible, but better than nothing.
26
+[ADDED] In a potentially failing attempt of fixing the Nichrome Issue in Stainless Steel, I added a Version of the Recipe that takes Nichrome instead of Invar, which is ofcourse in the proper ratios. I do not know how well that will work for people using the Crucible, but better than nothing. I did the same for Ultimet and Signalum too.
27 27
 [ADDED] Barbecue Sauce (BBQ Sauce), because why not.
28 28
 [ADDED] Axes, Saws and Chainsaws can now place Saplings too. They will still place Workbenches if Saplings cant be placed.
29 29
 [ADDED] Tooltip for Covers that can be controlled with the Cover Controller Cover. In case of Covers where the Cover Controller Cover is required (such as Shutter Cover), it will be Cyan instead of Dark Gray to make it easier to see.

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

@@ -2896,7 +2896,6 @@ public class MT {
2896 2896
 			Steel                   .addAlloyingRecipe(new OreDictConfigurationComponent( 1, OM.stack(WroughtIron                   , 1*U), OM.stack(Air                , 1*U)));
2897 2897
 			MeteoricSteel           .addAlloyingRecipe(new OreDictConfigurationComponent( 1, OM.stack(MeteoricIron                  , 1*U), OM.stack(Air                , 1*U)));
2898 2898
 			
2899
-			
2900 2899
 			for (OreDictMaterial tMat : ANY.Glowstone.mToThis) if (tMat != Glowstone) {
2901 2900
 			EnergeticAlloy          .addAlloyingRecipe(new OreDictConfigurationComponent( 1, OM.stack(InductiveAlloy                , 2*U), OM.stack(tMat               , 1*U)));
2902 2901
 			Lumium                  .addAlloyingRecipe(new OreDictConfigurationComponent( 4, OM.stack(Sn                            , 3*U), OM.stack(Ag                 , 1*U), OM.stack(tMat, 4*U)));
@@ -2923,6 +2922,8 @@ public class MT {
2923 2922
 			Bronze                  .addAlloyingRecipe(new OreDictConfigurationComponent( 4, OM.stack(AnnealedCopper                , 3*U), OM.stack(Sn                 , 1*U)));
2924 2923
 			BlackBronze             .addAlloyingRecipe(new OreDictConfigurationComponent( 5, OM.stack(AnnealedCopper                , 3*U), OM.stack(Electrum           , 2*U)));
2925 2924
 			Signalum                .addAlloyingRecipe(new OreDictConfigurationComponent( 8, OM.stack(AnnealedCopper                , 1*U), OM.stack(Ag                 , 2*U), OM.stack(RedAlloy, 5*U)));
2925
+			Signalum                .addAlloyingRecipe(new OreDictConfigurationComponent(16, OM.stack(Cu                            , 1*U), OM.stack(SterlingSilver     , 5*U), OM.stack(RedAlloy,10*U)));
2926
+			Signalum                .addAlloyingRecipe(new OreDictConfigurationComponent(16, OM.stack(AnnealedCopper                , 1*U), OM.stack(SterlingSilver     , 5*U), OM.stack(RedAlloy,10*U)));
2926 2927
 			Constantan              .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(AnnealedCopper                , 1*U), OM.stack(Ni                 , 1*U)));
2927 2928
 			YttriumBariumCuprate    .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(AnnealedCopper                , 3*U), OM.stack(Ba                 , 2*U), OM.stack(Y, U)));
2928 2929
 			YttriumBariumCuprate    .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(Cu                            , 3*U), OM.stack(Ba                 , 2*U), OM.stack(Y, U)));

+ 1
- 1
src/main/java/gregtech/loaders/a/Loader_Ores.java View File

@@ -232,7 +232,7 @@ public class Loader_Ores implements Runnable {
232 232
 		rockset(MD.MIN, "gneiss"                        , 0, "min.gneiss"           , OP.oreVanillastone        , MT.Gneiss);
233 233
 		rockset(MD.MIN, "dolomite"                      , 0, "min.dolomite"         , OP.oreVanillastone        , MT.Dolomite);
234 234
 		rockset(MD.MIN, "rhyolite"                      , 0, "min.rhyolite"         , OP.oreVanillastone        , MT.Rhyolite);
235
-		rockset(MD.MIN, "pumice"                        , 0, "min.pumice"           , OP.oreVanillastone        , MT.Stone);
235
+		rockset(MD.MIN, "pumice"                        , 0, "min.pumice"           , OP.oreVanillastone        , MT.Pumice);
236 236
 		rockset(MD.MIN, "conglomerate"                  , 0, "min.conglomerate"     , OP.oreVanillastone        , MT.Stone);
237 237
 		rockset(MD.MIN, "pegmatite"                     , 0, "min.pegmatite"        , OP.oreVanillastone        , MT.Stone);
238 238
 		rockset(MD.MIN, "chert"                         , 0, "min.chert"            , OP.oreVanillastone        , MT.Chert);

+ 15
- 12
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -378,7 +378,7 @@ public class Loader_Worldgen implements Runnable {
378 378
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "gneiss"      ), MT.Gneiss    ));
379 379
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "dolomite"    ), MT.Dolomite  ));
380 380
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "rhyolite"    ), MT.Rhyolite  ));
381
-		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "pumice"      ), MT.Stone     ));
381
+		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "pumice"      ), MT.Pumice    ));
382 382
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "conglomerate"), MT.Stone     ));
383 383
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "pegmatite"   ), MT.Stone     ));
384 384
 		StoneLayer.LAYERS.add(new StoneLayer(ST.block(MD.MIN, "chert"       ), MT.Chert     ));
@@ -452,17 +452,26 @@ public class Loader_Worldgen implements Runnable {
452 452
 		}
453 453
 		
454 454
 		
455
-		StoneLayer.bothsides(MT.Basalt, MT.Limestone
456
-		, new StoneLayerOres(MT.OREMATS.Ilmenite        , U8 ,  0, 32)
457
-		, new StoneLayerOres(MT.TiO2                    , U12,  0, 32)
455
+		StoneLayer.bothsides(MT.Komatiite, MT.Stone
456
+		, new StoneLayerOres(MT.Redstone                , U8 ,  0, 30)
458 457
 		);
459
-		StoneLayer.bothsides(MT.Basalt, MT.Komatiite
458
+		StoneLayer.bothsides(MT.Komatiite, MT.Basalt
460 459
 		, new StoneLayerOres(MT.OREMATS.Perlite         , U4 ,  0, 16)
461 460
 		);
462
-		StoneLayer.topbottom(MT.Diorite, MT.Limestone
461
+		StoneLayer.bothsides(MT.Limestone, MT.Basalt
462
+		, new StoneLayerOres(MT.OREMATS.Ilmenite        , U8 ,  0, 32)
463
+		, new StoneLayerOres(MT.TiO2                    , U12,  0, 32)
464
+		);
465
+		StoneLayer.topbottom(MT.Limestone, MT.Diorite
463 466
 		, new StoneLayerOres(MT.Opal                    , U64, 48, 64)
464 467
 		, new StoneLayerOres(MT.OREMATS.Diatomite       , U16, 16, 64)
465 468
 		);
469
+		StoneLayer.bothsides(MT.Limestone, MT.NaCl
470
+		, new StoneLayerOres(MT.OREMATS.Borax           , U8 , 16, 48)
471
+		);
472
+		StoneLayer.bothsides(MT.Limestone, MT.KCl
473
+		, new StoneLayerOres(MT.KIO3                    , U12, 32, 64)
474
+		);
466 475
 		StoneLayer.bothsides(MT.Limestone, MT.Quartzite
467 476
 		, new StoneLayerOres(MT.OREMATS.Kyanite         , U3 , 32, 72)
468 477
 		, new StoneLayerOres(MT.OREMATS.Lepidolite      , U12, 16, 48)
@@ -474,12 +483,6 @@ public class Loader_Worldgen implements Runnable {
474 483
 		, new StoneLayerOres(MT.Talc                    , U4 ,  0, 80)
475 484
 		, new StoneLayerOres(MT.OREMATS.Glauconite      , U4 , 32, 80)
476 485
 		);
477
-		StoneLayer.bothsides(MT.Limestone, MT.NaCl
478
-		, new StoneLayerOres(MT.OREMATS.Borax           , U8 , 16, 48)
479
-		);
480
-		StoneLayer.bothsides(MT.Limestone, MT.KCl
481
-		, new StoneLayerOres(MT.KIO3                    , U12, 32, 64)
482
-		);
483 486
 		StoneLayer.bothsides(MT.Greenschist, MT.Gypsum
484 487
 		, new StoneLayerOres(MT.OREMATS.Mirabilite      , U8 , 16, 64)
485 488
 		, new StoneLayerOres(MT.OREMATS.Trona           , U8 , 16, 64)

Loading…
Cancel
Save