post merge cleanup

changelog

@@ -9,8 +9,12 @@
 * Pneumatic tubes now have a special case when supplying autocrafters, they will only send single items since larger stacks are not accepted
 * Simplified turbofan recipe
 * Solar boilers will now show a tooltip when they are too cold
+* Updated the satellite dish structure, due to the new spawn rules it's also no longer obscenely rare
+* The rare small lab structures have been removed and replaced with a new lighthouse
 
 ## Fixed
 * Fixed fatal gamebreaking hard drive corrupting issue where taurun leggings were misspelled
 * Fixed minor display issue where compressed air ducts would visually connect to non-ejector pneumatic tubes
-* Fixed special creeper types being able to spawn in other dimensions
+* Fixed special creeper types being able to spawn in other dimensions
+* Fixed modeled armor using weird rotation rules, causing issues with Customizable Player Models
+* Fixed rotation issues for certain blocks using the new structure system

gradle.properties

@@ -38,6 +38,7 @@ credits=HbMinecraft,\
   \ Frooz (gun models),\
   \ VT-6/24 (models, textures),\
   \ Nos (models),\
+  \ WushiThe (models),\
   \ Minecreep (models),\
   \ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
   \ instantnootles (concept artist),\
@@ -52,6 +53,7 @@ credits=HbMinecraft,\
   \ BallOfEnergy1 (OpenComputers integration, RBMK and packet optimization, crate backpacks),\
   \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
   \ Abel1502 (optimization, crate upgrade recipes, strand caster improvements, varous tweaks),\
+  \ Darek505 (armor rendering compatibility fix),\
   \ SuperCraftAlex (tooltips)\
   \ Ice-Arrow (research reactor tweaks),\
   \ 245tt (anvil GUI improvements),\

src/main/java/com/hbm/itempool/ItemPoolsComponent.java

@@ -11,7 +11,6 @@ import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemRTGPelletDepleted;
 import com.hbm.items.tool.ItemBlowtorch;
 
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.util.WeightedRandomChestContent;
 

src/main/java/com/hbm/render/tileentity/RenderSkeletonHolder.java

@@ -3,7 +3,6 @@ package com.hbm.render.tileentity;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.blocks.generic.BlockSkeletonHolder.TileEntitySkeletonHolder;
-import com.hbm.items.weapon.sedna.ItemGunBaseNT;
 import com.hbm.main.ResourceManager;
 
 import net.minecraft.block.Block;
@@ -46,10 +45,6 @@ public class RenderSkeletonHolder extends TileEntitySpecialRenderer {
 
 			GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
 
-			if(stack.getItem() instanceof ItemGunBaseNT) {
-				GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
-			}
-
 			if(!(stack.getItemSpriteNumber() == 0 && stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType()))) {
 				GL11.glScaled(1.5, 1.5, 1.5);
 			}

src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java

@@ -91,9 +91,10 @@ public class TileEntityGeiger extends TileEntity implements SimpleComponent, IIn
 		data.setString(CompatEnergyControl.S_CHUNKRAD, chunkPrefix + rads + " RAD/s");
 
 	}
+	
 	@Override
 	public AxisAlignedBB getRenderBoundingBox() {
-		return TileEntity.INFINITE_EXTENT_AABB;
+		return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
 	}
 
 	@Override