the spoingus

changelog

@@ -1,3 +1,11 @@
+## Added
+* Two new anti-material rifle variants
+  * .50 BMG demolisher rounds are finally usable
+  * Added a special ammo type exclusive to one of the variants
+* Starmetal .50 BMG now returns
+  * Overall better armor piercing stats than DU
+  * Not compatible with the M2, only usable in amat rifles
+
 ## Changed
 * The RBMK console's grid can now be rotated using a screwdriver
 * Tool abilities have changed
@@ -13,3 +21,4 @@
 * Conveyor ejectors should now correctly place items onto the back of splitters instead of on the output belts
 * Fixed strand caster fluid gauges going out of bounds
 * Fixed arc welder and soldering station not changing buffer size based on upgrade, preventing use of higher overdrive tiers
+* Fixed non-standard template folder recipes not using the correct icon

gradle.properties

@@ -9,18 +9,19 @@ credits=HbMinecraft,\
   \ Drillgon200 (effects, models, porting),\
   \ MartinTheDragon (calculator, chunk-based fallout, bendable cranes, pipe improvements, PWR sounds),\
   \ Alcater (GUI textures, porting),\
-  \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, better particle diodes),\
+  \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, conveyor wand, NBT structures),\
   \ Pheo (textures, various machines, models, weapons),\
-  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron, weapon animations),\
+  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron, weapon animations),\
   \ UFFR (RTG pellets, guns, casings, euphemium capacitor, nucleartech.wiki),\
   \ LePeep (coilgun model, BDCL QC),\
   \ Adam29 (liquid petroleum, ethanol, electric furnace),\
   \ Pvndols (thorium fuel recipe, gas turbine),\
   \ JamesH2 (blood mechanics, nitric acid, particle emitter),\
-  \ Lazzzycat (structures),\
+  \ Lazzzycat (structures, mob gear),\
   \ PastaBaguette (coal horse decal),\
   \ Doctor17 (russian localization)),\
   \ Pashtet (russian localization),\
+  \ 7H40 (russian localization),\
   \ Bismarck (chinese localization),\
   \ Creeper-banner (chinese localization),\
   \ 5467864  (chinese localization),\
@@ -32,6 +33,7 @@ credits=HbMinecraft,\
   \ UnnameTokiko (chinese localization),\
   \ Herobrine 457985 (chinese localization),\
   \ xxwinhere (chinese localization),\
+  \ Nycticoraxnightheron (chinese localization),\
   \ Maksymisio (polish localization)\
   \ el3ctro4ndre (italian localization),\
   \ Pu-238 (Tom impact effects),\
@@ -40,9 +42,11 @@ credits=HbMinecraft,\
   \ Nos (models),\
   \ WushiThe (models),\
   \ Minecreep (models),\
+  \ ackbarcrowbars (models),\
+  \ haru315 (spiral point algorithm),\
+  \ mlbv (threaded MK5),\
   \ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
   \ instantnootles (concept artist),\
-  \ haru315 (spiral point algorithm),\
   \ Sten89 (models),\
   \ Pixelguru26 (textures),\
   \ TheBlueHat (textures),\
@@ -60,7 +64,9 @@ credits=HbMinecraft,\
   \ KoblizekXD (doors),\
   \ FOlkvangrField (custom machine parts),\
   \ RosaTryp (centrifuge config),\
-  \ Toshayo (satellite loot system, project settings, gradle curse task),\
+  \ Toshayo (satellite loot system, project settings, gradle curse task, OpenComputers integration),\
+  \ Dash (PA particle serialization fix),\
+  \ archiecarrot123 (armor rendering compatibility fix),\
   \ icomet (refactoring),\
   \ martemen (project settings),\
   \ OvermindDL1 (project settings),\

src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java

@@ -28,6 +28,7 @@ import com.hbm.inventory.material.Mats;
 import com.hbm.inventory.material.NTMMaterial;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.items.ModItems;
+import com.hbm.items.ItemEnums.EnumCasingType;
 import com.hbm.items.ItemGenericPart.EnumPartType;
 import com.hbm.items.machine.ItemAssemblyTemplate;
 import com.hbm.items.machine.ItemCircuit.EnumCircuitType;
@@ -36,6 +37,7 @@ import com.hbm.items.machine.ItemPACoil.EnumCoilType;
 import com.hbm.items.machine.ItemPistons.EnumPistonType;
 import com.hbm.items.weapon.ItemAmmoHIMARS;
 import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo;
+import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret;
 import com.hbm.main.MainRegistry;
 
 import cpw.mods.fml.common.Loader;
@@ -793,6 +795,18 @@ public class AssemblerRecipes extends SerializableRecipe {
 				new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED),
 			}, 100);
 
+		makeRecipe(new ComparableStack(ModItems.ammo_standard, 6, EnumAmmo.BMG50_SM), new AStack[] {
+				new ComparableStack(ModItems.casing, 1, EnumCasingType.LARGE_STEEL),
+				new OreDictStack(ANY_SMOKELESS.dust(), 6),
+				new OreDictStack(STAR.ingot(), 3),
+			}, 100, ModItems.journal_silver);
+		makeRecipe(new ComparableStack(ModItems.ammo_secret, 12, EnumAmmoSecret.BMG50_BLACK), new AStack[] {
+				new ComparableStack(ModItems.casing, 2, EnumCasingType.LARGE_STEEL),
+				new OreDictStack(ANY_SMOKELESS.dust(), 24),
+				new OreDictStack(WEAPONSTEEL.ingot(), 8),
+				new ComparableStack(ModItems.black_diamond),
+			}, 1200, ModItems.journal_silver);
+
 		makeRecipe(new ComparableStack(ModBlocks.machine_silex, 1), new AStack[] {
 				new ComparableStack(ModBlocks.glass_quartz, 16),
 				!exp ? new OreDictStack(STEEL.plateCast(), 8) : new OreDictStack(STEEL.heavyComp(), 1),

src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java

@@ -54,7 +54,7 @@ public class ItemAssemblyTemplate extends Item {
 		//LEGACY
 		if(out == null) out = AssemblerRecipes.recipeList.get(stack.getItemDamage());
 
-		AssemblerRecipe recipe = AssemblerRecipes.recipes.get(stack);
+		AssemblerRecipe recipe = AssemblerRecipes.recipes.get(out);
 
 		if(recipe != null && !recipe.folders.contains(ModItems.template_folder))
 			return this.hiddenIcon;

src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java

@@ -68,7 +68,7 @@ public class XFactory50 {
 				.setCasing(casing50.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50du"));
 		bmg50_he = new BulletConfig().setItem(EnumAmmo.BMG50_HE).setCasing(EnumCasingType.LARGE_STEEL, 12).setWear(3F).setDoesPenetrate(true).setDamageFalloffByPen(false).setDamage(1.75F).setOnImpact(LAMBDA_STANDARD_EXPLODE)
 				.setCasing(casing50.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50he"));
-		bmg50_sm = new BulletConfig().setItem(EnumAmmo.BMG50_SM).setCasing(EnumCasingType.LARGE_STEEL, 12).setWear(10F).setDoesPenetrate(true).setDamageFalloffByPen(false).setDamage(2.5F).setThresholdNegation(30F).setArmorPiercing(0.35F)
+		bmg50_sm = new BulletConfig().setItem(EnumAmmo.BMG50_SM).setCasing(EnumCasingType.LARGE_STEEL, 6).setWear(10F).setDoesPenetrate(true).setDamageFalloffByPen(false).setDamage(2.5F).setThresholdNegation(30F).setArmorPiercing(0.35F)
 				.setCasing(casing50.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50sm"));
 		bmg50_black = new BulletConfig().setItem(EnumAmmoSecret.BMG50_BLACK).setWear(5F).setDoesPenetrate(true).setDamageFalloffByPen(false).setSpectral(true).setDamage(1.5F).setHeadshot(3F).setThresholdNegation(30F).setArmorPiercing(0.35F)
 				.setCasing(casing50.clone().setColor(SpentCasing.COLOR_CASE_EQUESTRIAN).register("bmg50black"));