From ec389b72f9e77a2c82c50c8f00b885f4778b58cd Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 2 Mar 2024 23:26:40 +0100 Subject: [PATCH] crap --- changelog | 11 +++++++++++ .../inventory/recipes/CustomMachineRecipes.java | 2 +- .../gui/weapon/gui_launch_pad_structure.png | Bin 0 -> 3896 bytes 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/hbm/textures/gui/weapon/gui_launch_pad_structure.png diff --git a/changelog b/changelog index 98a2da525..f7e259775 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +##Added +* CRTs and toasters + * Decorative blocks that will spawn in upcoming dungeons +* Snow globes +* Sentry turret "Edwin" + * A broken down version of the sentry turret with infinite power and ammo + * Will be found in the new silo structure + ## Changed * Updated chinese localization * Tweaked super shotgun animations, added config for changing the animation style @@ -17,9 +25,12 @@ * Schrabidium transmutation by fallout is now limited to the inner 40% of the sellafite conversion radius * Fluid traits are now listed in a fixed order instead of being arranged randomly * Hidden fluid trait descriptions will now be added below the visible part of that trait instead of below the last visible trait +* The methusalem turret no longer drops anything when broken ## Fixed * Fixed the structure toggle on the world creation screen not working correctly on most world types * Fixed antiknock having a broken sprite and localization * Fixed crash caused by fallout affecting spotlight blocks, crashing the game * Fixed 528 mode bedrock ore replacements not working +* Fixed potential crashes with improperly configured custom machines +* Fixed misspelling in the custom machine config template diff --git a/src/main/java/com/hbm/inventory/recipes/CustomMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/CustomMachineRecipes.java index bf9895e2d..a91431fa8 100644 --- a/src/main/java/com/hbm/inventory/recipes/CustomMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CustomMachineRecipes.java @@ -125,7 +125,7 @@ public class CustomMachineRecipes extends SerializableRecipe { writer.name("consumptionPerTick").value(recipeInstance.consumptionPerTick); writer.name("pollutionType").value(recipeInstance.pollutionType); writer.name("pollutionAmount").value(recipeInstance.pollutionAmount); - writer.name("radiationnAmount").value(recipeInstance.radiationAmount); + writer.name("radiationAmount").value(recipeInstance.radiationAmount); writer.name("flux").value(recipeInstance.flux); writer.name("heat").value(recipeInstance.heat); diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gui_launch_pad_structure.png b/src/main/resources/assets/hbm/textures/gui/weapon/gui_launch_pad_structure.png new file mode 100644 index 0000000000000000000000000000000000000000..a2dc1aad1f48a7f00eb44db63f554364849a6f31 GIT binary patch literal 3896 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 D=pYPa literal 0 HcmV?d00001