scrungus

changelog

@@ -1,11 +1,13 @@
 ## Changed
 * QMAW now has buttons for returning to previously viewed pages
-* QMAW file detection now includes subfolders to `manual`
+* QMAW file detection now includes subfolders to `manual` in folder-based packs (which already worked in zip packs and the mod's jar file)
 * OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units
 * The sodium and strontium autogen ingots now have their correct hazard tags
 * Pattern matchers, like the one used on the automatic crafting table, no longer care about NBT data of an item
   * This means that RBMK fuel rods can now be automatically disassembled without the depletion number having to be a 100% match
   * Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets
+* Blueprint folders have been added to more loot pools, making them less rare
+* Replaced the winnie the pooh plushie with hundun
 
 ## Fixed
 * Fixed QMAW not working at all
@@ -14,4 +16,5 @@
 * Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors
 * Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot
 * Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes
-* Fixed balefire bomb not rendering the egg when fully loaded
+* Fixed balefire bomb not rendering the egg when fully loaded
+* Fixed selenium steel 12ga casings having the wrong color

src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java

@@ -123,7 +123,7 @@ public abstract class SerializableRecipe {
 					Reader reader = new InputStreamReader(stream);
 					recipe.readRecipeStream(reader);
 					recipe.modified = true;
-				} catch(IOException ex) {
+				} catch(Throwable ex) {
 					MainRegistry.logger.error("Failed to reset synced recipe stream", ex);
 				}
 			} else if(recFile.exists() && recFile.isFile()) {

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

@@ -109,7 +109,8 @@ public class ItemPoolsComponent {
 					weighted(ModItems.can_mrsugar, 0, 1, 2, 2),
 					weighted(ModItems.cap_nuka, 0, 1, 16, 2),
 					weighted(ModItems.book_guide, 3, 1, 1, 1),
-					weighted(ModBlocks.deco_computer, 0, 1, 1, 1)
+					weighted(ModBlocks.deco_computer, 0, 1, 1, 1),
+					weighted(ModItems.blueprint_folder, 0, 1, 1, 1)
 			};
 		}};
 
@@ -158,7 +159,8 @@ public class ItemPoolsComponent {
 					weighted(ModItems.powder_bromine, 0, 1, 1, 1),
 					weighted(ModItems.powder_cobalt, 0, 1, 1, 1),
 					weighted(ModItems.powder_neodymium, 0, 1, 1, 1),
-					weighted(ModItems.powder_boron, 0, 1, 1, 1)
+					weighted(ModItems.powder_boron, 0, 1, 1, 1),
+					weighted(ModItems.blueprint_folder, 1, 1, 1, 1)
 			};
 		}};
 
@@ -186,7 +188,9 @@ public class ItemPoolsComponent {
 					weighted(Items.paper, 0, 1, 6, 7),
 					weighted(Items.clock, 0, 1, 1, 3),
 					weighted(Items.book, 0, 1, 5, 10),
-					weighted(Items.experience_bottle, 0, 1, 3, 1)
+					weighted(Items.experience_bottle, 0, 1, 3, 1),
+					weighted(ModItems.blueprint_folder, 0, 1, 1, 1),
+					weighted(ModItems.blueprint_folder, 1, 1, 1, 1)
 			};
 		}};
 
@@ -222,7 +226,7 @@ public class ItemPoolsComponent {
 				weighted(ModItems.pellet_rtg_weak,0, 0, 1, 1),
 			};
 		}};
-        
+		
 		new ItemPool(POOL_REPAIR_MATERIALS) {{
 			this.pool = new WeightedRandomChestContent[] {
 				weighted(ModItems.ingot_aluminium, 0, 2, 8, 3),

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

@@ -271,8 +271,8 @@ public class XFactory12ga {
 		g12_phosphorus = new BulletConfig().setItem(EnumAmmo.G12_PHOSPHORUS).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 6).setProjectiles(8).setDamage(1F/8F).setSpread(magnumSpread).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x910001, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_PHOSPHORUS"))
 				.setOnImpact((bullet, mop) -> { if(mop.entityHit != null && mop.entityHit instanceof EntityLivingBase) { HbmLivingProps data = HbmLivingProps.getData((EntityLivingBase) mop.entityHit); if(data.phosphorus < 300) data.phosphorus = 300; } });
 		//g12_anthrax = new BulletConfig().setItem(EnumAmmo.G12_ANTHRAX).setProjectiles(8).setDamage(1F/8F).setSpread(0.015F).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x749300, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_ANTHRAX"));
-		g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianBJ"));
-		g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianTKR"));
+		g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianBJ"));
+		g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianTKR"));
 
 		BulletConfig[] all = new BulletConfig[] {g12_bp, g12_bp_magnum, g12_bp_slug, g12, g12_slug, g12_flechette, g12_magnum, g12_explosive, g12_phosphorus};