diff --git a/changelog b/changelog index ae41e4836..024946d82 100644 --- a/changelog +++ b/changelog @@ -1,37 +1,7 @@ ## Added -* Configs for all things pollution related - * Pollution in general can be turned off, smog can be disabled and adjusted, different poison types can be disabled and the threshold for spawning tougher mobs can also be changed -* Glyphid meat - * Dropped by glyphids (duh) - * Can be grilled -* Glyphid eggs - * Dropped from glyphid spawners - * Currently unused -* Fluid valves - * come in manual and restone variants -* Smokestack - * Most polluting machines can now be connected to a smokestack with exhaust pipes - * The smokestack will vent the pollution created by the machines, reducing it by 75% - * Compatible with soot, heavy metal and poison pollution -* Sliding blast door - * Everyone's favorite from 1.12 - * Has multiple skins that can be applied -* Helium-4 - * Used in helium-4-oxygen plasma - * Made from ionized particles in a liquefactor ## Changed -* Glyphids now have a config for a global spawn limit, which is 50 by default, no more than this many glyphids can be created at once -* Removed the old oil and gas ducts for good -* FBI agents and drones no longer take damage from rosenberg pest control boxes -* Compressors now have a base comsumption of 2,500 HE/t instwad of 10,000 -* On 528 mode, gas shale now only contains 50mB of petroleum instead of 250mB -* Xenon-mercury plasma has been changed into helium-4-oxygen plasma - * This means that current xenon-mercury setups will no longer work ## Fixed -* Fixed player extprops like the HUD or backpack toggles not saving -* Fixed desync caused by teleporting between dimensions, switching toggles for HUD or backpack -* Fixed potential issue causing the plasma heater to overfill -* Fixed back connector of the compressor not working properly -* Fixed a dupe regarind one of the conveyor blocks, not telling you which, though \ No newline at end of file +* Fixed quantity of the fusion reactor's construction recipe not being displayed right +* Fixed fluid valve and redstone fluid valves having the wrong names diff --git a/src/main/java/com/hbm/handler/nei/ConstructionHandler.java b/src/main/java/com/hbm/handler/nei/ConstructionHandler.java index 557a71163..c845f1601 100644 --- a/src/main/java/com/hbm/handler/nei/ConstructionHandler.java +++ b/src/main/java/com/hbm/handler/nei/ConstructionHandler.java @@ -46,9 +46,9 @@ public class ConstructionHandler extends NEIUniversalHandler { /* ITER */ ItemStack[] iter = new ItemStack[] { new ItemStack(ModBlocks.fusion_conductor, 36), - ItemStackUtil.addTooltipToStack(new ItemStack(ModBlocks.fusion_conductor, 320), EnumChatFormatting.RED + "5x64"), + ItemStackUtil.addTooltipToStack(new ItemStack(ModBlocks.fusion_conductor, 256), EnumChatFormatting.RED + "4x64"), new ItemStack(ModItems.plate_cast, 36, Mats.MAT_STEEL.id), - ItemStackUtil.addTooltipToStack(new ItemStack(ModItems.plate_cast, 320, Mats.MAT_STEEL.id), EnumChatFormatting.RED + "5x64"), + ItemStackUtil.addTooltipToStack(new ItemStack(ModItems.plate_cast, 256, Mats.MAT_STEEL.id), EnumChatFormatting.RED + "4x64"), new ItemStack(ModBlocks.fusion_center, 64), new ItemStack(ModBlocks.fusion_motor, 4), new ItemStack(ModBlocks.reinforced_glass, 8), diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 9e3463f96..17a4e9682 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -1266,14 +1266,16 @@ public class ModEventHandlerClient { case 3: main.splashText = "None shall enter The Orb!"; break; case 4: main.splashText = "Wacarb was here"; break; case 5: main.splashText = "SpongeBoy me Bob I am overdosing on keramine agagagagaga"; break; - case 6: main.splashText = "I know where you live, " + System.getProperty("user.name"); break; + case 6: main.splashText = EnumChatFormatting.RED + "I know where you live, " + System.getProperty("user.name"); break; case 7: main.splashText = "Nice toes, now hand them over."; break; case 8: main.splashText = "I smell burnt toast!"; break; case 9: main.splashText = "There are bugs under your skin!"; break; case 10: main.splashText = "Fentanyl!"; break; case 11: main.splashText = "Do drugs!"; break; - case 12: main.splashText = "post this on r/feedthememes for free internet points!"; break; + //case 12: main.splashText = "post this on r/feedthememes for free internet points!"; break; } + + if(Math.random() < 0.1) main.splashText = "Visit r/feedthebeast if you hate yourself!"; } } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index a727f87fd..5d0ffe69d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3804,8 +3804,8 @@ tile.fluid_duct_gauge.desc=Rohr welches anzeight, wie viel Flüssigkeit$sich pro tile.fluid_duct_neo.name=Universelles Flüssigkeitsrohr tile.fluid_duct_paintable.name=Geschirmtes universelles Flüssigkeitsrohr (Färbbar) tile.fluid_duct_solid.name=Geschirmtes universelles Flüssigkeitsrohr (Veraltet) -tile.fluid_switch.name=Redstone-Ventil -tile.fluid_valve.name=Ventil +tile.fluid_switch.name=Ventil +tile.fluid_valve.name=Redstone-Ventil tile.foam_layer.name=Schaumdecke tile.foundry_basin.name=Gussbecken tile.foundry_channel.name=Gusskanal diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index fbde73d5c..2495b1d4f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4679,8 +4679,8 @@ tile.fluid_duct_gauge.desc=Pipe that displays how much fluid$moves within the ne tile.fluid_duct_neo.name=Universal Fluid Duct tile.fluid_duct_paintable.name=Paintable Coated Universal Fluid Duct tile.fluid_duct_solid.name=Coated Universal Fluid Duct (Deprecated) -tile.fluid_switch.name=Redstone Fluid Valve -tile.fluid_valve.name=Fluid Valve +tile.fluid_switch.name=Fluid Valve +tile.fluid_valve.name=Redstone Fluid Valve tile.foam_layer.name=Foam layer tile.foundry_basin.name=Foundry Basin tile.foundry_channel.name=Foundry Channel