QMAW!

README.md

@@ -10,9 +10,9 @@
 
 **This is for 1.7.10!** For 1.12, check out these projects:
 
-* NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases
-* NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases
 * NTM Community Edition (WarFactory): https://github.com/MisterNorwood/Hbm-s-Nuclear-Tech-CE
+* NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases
+* NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases
 
 For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases
 

changelog

@@ -1,15 +1,7 @@
 ## Changed
-* The amount of filled rebar that can be rendered at once is now capped (can be changed with the client config `RENDER_REBAR_LIMIT`)
-  * This causes holes and looks a bit buggy, but for now it's better than lagging the game out
-* The amount of light beams per solar boiler is now limited (can be changed with the client config `RENDER_HELIOSTAT_BEAM_LIMIT`)
-* Changed the way mirror linking works for the solar boiler
-  * The max range is now 100m (instead of 25m)
-  * There is now an angle requirement, mirrors cannot be rotated more than 45°
-  * This means that the solar boiler can use more mirrors, the higher up it is
-  * Existing setups will continue to function, as these rules only apply during the linking process
-* The PWR and watz now have NEI handlers, showing the fuel to depleted fuel process
+* Added more QMAW manual pages
+* WIAJ presentations now use a configurable keybind, like QMAW
+  * The default keybind is now F5, in order to not collide with QMAW's F1
 
 ## Fixed
-* Fixed broken localization in the recipe selector GUI
-* Fixed the server crashing instantly
-  * I lost track of how many times this has been an issue
+* Fixed fusion reactor item IO being broken

src/main/java/com/hbm/config/FalloutConfigJSON.java

@@ -207,7 +207,7 @@ public class FalloutConfigJSON {
 		public FalloutEntry fo(double falloffStart) { this.falloffStart = falloffStart; return this; }
 		public FalloutEntry sol(boolean solid) { this.isSolid = solid; return this; }
 		
-		public boolean eval(World world, int x, int y, int z, Block b, int meta, double dist, Block originalBlock, int originalMeta) {
+		public boolean eval(World world, int x, int y, int z, Block b, int meta, double dist) {
 
 			if(dist > maxDist || dist < minDist) return false;
 			if(matchesBlock != null && b != matchesBlock) return false;
@@ -219,9 +219,9 @@ public class FalloutConfigJSON {
 			MetaBlock conversion = chooseRandomOutcome((primaryChance == 1D || rand.nextDouble() < primaryChance) ? primaryBlocks : secondaryBlocks);
 			
 			if(conversion != null) {
-				if(conversion.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked && conversion.meta <= originalMeta) return false;
-				if(conversion.block == ModBlocks.sellafield_bedrock && originalBlock == ModBlocks.sellafield_bedrock && conversion.meta <= originalMeta) return false;
-				if(originalBlock == ModBlocks.sellafield_bedrock && conversion.block != ModBlocks.sellafield_bedrock) return false;
+				if(conversion.block == ModBlocks.sellafield_slaked && b == ModBlocks.sellafield_slaked && conversion.meta <= meta) return false;
+				if(conversion.block == ModBlocks.sellafield_bedrock && b == ModBlocks.sellafield_bedrock && conversion.meta <= meta) return false;
+				if(b == ModBlocks.sellafield_bedrock && conversion.block != ModBlocks.sellafield_bedrock) return false;
 				if(y == 0 && conversion.block != ModBlocks.sellafield_bedrock) return false;
 				
 				world.setBlock(x, y, z, conversion.block, conversion.meta, 3);

src/main/java/com/hbm/entity/effect/EntityFalloutRain.java

@@ -187,7 +187,7 @@ public class EntityFalloutRain extends EntityExplosionChunkloading {
 			
 			for(FalloutEntry entry : FalloutConfigJSON.entries) {
 				
-				if(entry.eval(worldObj, x, y, z, b, meta, dist, b, meta)) {
+				if(entry.eval(worldObj, x, y, z, b, meta, dist)) {
 					if(entry.isSolid()) {
 						depth++;
 					}

src/main/java/com/hbm/handler/HbmKeybinds.java

@@ -39,6 +39,7 @@ public class HbmKeybinds {
 	public static KeyBinding trainKey = new KeyBinding(category + ".trainInv", Keyboard.KEY_R, category);
 
 	public static KeyBinding qmaw = new KeyBinding(category + ".qmaw", Keyboard.KEY_F1, category);
+	public static KeyBinding wiaj = new KeyBinding(category + ".wiaj", Keyboard.KEY_F5, category);
 	
 	public static KeyBinding abilityCycle = new KeyBinding(category + ".ability", -99, category);
 	public static KeyBinding abilityAlt = new KeyBinding(category + ".abilityAlt", Keyboard.KEY_LMENU, category);
@@ -65,6 +66,7 @@ public class HbmKeybinds {
 		ClientRegistry.registerKeyBinding(trainKey);
 		
 		ClientRegistry.registerKeyBinding(qmaw);
+		ClientRegistry.registerKeyBinding(wiaj);
 
 		ClientRegistry.registerKeyBinding(reloadKey);
 		ClientRegistry.registerKeyBinding(gunPrimaryKey);

src/main/java/com/hbm/main/ClientProxy.java

@@ -772,7 +772,7 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntityPigeon.class, new RenderPigeon(new ModelPigeon(), 0.3F));
 		RenderingRegistry.registerEntityRenderingHandler(EntityDummy.class, new RenderDummy());
 		RenderingRegistry.registerEntityRenderingHandler(EntityUndeadSoldier.class, new RenderUndeadSoldier());
-		//"particles"
+		//"particles" (abysmal dogshit)
 		RenderingRegistry.registerEntityRenderingHandler(EntityChlorineFX.class, new MultiCloudRenderer(new Item[] { ModItems.chlorine1, ModItems.chlorine2, ModItems.chlorine3, ModItems.chlorine4, ModItems.chlorine5, ModItems.chlorine6, ModItems.chlorine7, ModItems.chlorine8 }));
 		RenderingRegistry.registerEntityRenderingHandler(EntityPinkCloudFX.class, new MultiCloudRenderer(new Item[] { ModItems.pc1, ModItems.pc2, ModItems.pc3, ModItems.pc4, ModItems.pc5, ModItems.pc6, ModItems.pc7, ModItems.pc8 }));
 		RenderingRegistry.registerEntityRenderingHandler(com.hbm.entity.particle.EntityCloudFX.class, new MultiCloudRenderer(new Item[] { ModItems.cloud1, ModItems.cloud2, ModItems.cloud3, ModItems.cloud4, ModItems.cloud5, ModItems.cloud6, ModItems.cloud7, ModItems.cloud8 }));

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -745,7 +745,7 @@ public class ModEventHandlerClient {
 		try {
 			CanneryBase cannery = Jars.canneries.get(comp);
 			if(cannery != null) {
-				list.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey("cannery.f1"));
+				list.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey("cannery.f1", Keyboard.getKeyName(HbmKeybinds.wiaj.getKeyCode())));
 				lastCannery = comp;
 				canneryTimestamp = Clock.get_ms();
 			}
@@ -895,7 +895,7 @@ public class ModEventHandlerClient {
 			}
 		}
 
-		if(Keyboard.isKeyDown(Keyboard.KEY_F1) && Minecraft.getMinecraft().currentScreen != null) {
+		if(Keyboard.isKeyDown(HbmKeybinds.wiaj.getKeyCode()) && Minecraft.getMinecraft().currentScreen != null) {
 
 			ComparableStack comp = canneryTimestamp > Clock.get_ms() - 100 ? lastCannery : null;
 

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

@@ -318,7 +318,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyRece
 
 	@Override
 	public boolean canExtractItem(int slot, ItemStack stack, int side) {
-		return slot == 2; // only allow removing breeder outputs
+		return slot == 2 || slot == 4; // only allow removing breeder outputs <- ?????
 	}
 
 	@Override

src/main/resources/assets/hbm/lang/en_US.lang

@@ -468,7 +468,7 @@ book_lore.beacon.page.9=Once the desired peer has responded, give the "ACCEPT CO
 book_lore.beacon.page.10=using the FAR-5M standard. Communication will end immediately if no standard has been negotiated, serving as a "ping". Should communication continue, the connection can be ended using another long single tone "END CONNECTION".
 book_lore.beacon.page.11=Chapter 5: Warranty $ [ page intentionally left blank ]
 
-cannery.f1=[ Press F1 for help ]
+cannery.f1=[ Press %s for a presentation ]
 
 cannery.centrifuge=Gas Centrifuge
 cannery.centrifuge.0=Gas centrifuges can be supplied with fluid using regular fluid ducts.

src/main/resources/assets/hbm/manual/guide/oil.json

@@ -0,0 +1,11 @@
+{
+	"name": "Oil Collection",
+	"icon": ["hbm:tile.ore_oil", 1, 0],
+	"trigger": [["hbm:tile.ore_oil"], ["hbm:item.oil_detector", 1, 0]],
+	"title": {
+		"en_US": "Oil Collection"
+	},
+	"content": {
+		"en_US": "Oil can be found in two forms: Oil deposits and bedrock oil.<br><br>Oil deposits spawn like ores but shouldn't be minded, rather they require a [[derrick|Derrick]] or [[pumpjack|Pumpjack]] on the surface to dig down and extract the oil. The deposits can be found either when mining, or from the surface by using an oil deposit detector. The detector scans a small radius for oil, and also gives a notification when there's a deposit directly below. Oil deposits will last a while, but are ultimately finite.<br><br>Bedrock oil cannot be located this way, instead it is marked on the surface by patches of oily dirt or sand. Bedrock oil is infinite, however it requires a specialized [[hydraulic fracking tower|Hydraulic Fracking Tower]] to be extracted, which needs [[fracking solution|Fracking Solution]] to work.<br><br>See also:<br>[[Basic Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/guide/oil1.json

@@ -0,0 +1,11 @@
+{
+	"name": "Basic Oil Processing",
+	"icon": ["hbm:tile.machine_refinery", 1, 0],
+	"trigger": [],
+	"title": {
+		"en_US": "Basic Oil Processing"
+	},
+	"content": {
+		"en_US": "Basic oil processing (\"Oil 1\") involves separating [[crude oil|Crude Oil]] using a [[refinery|Oil Refinery]].<br><br>For this you will need:<br>[[Boiler]]<br>[[External Heat Source]]<br>[[Oil Refinery]]<br>[[Fractioning Tower]]<br><br>Connect your source of crude oil to the boiler. Set the boiler's input type to crude oil by right-clicking it with a fluid identifier. Power up the boiler using a heat source (like a [[firebox|Firebox]]) and pipe the resulting hot crude oil into the refinery.<br><br>Most resulting oils can be split once more with a fractioning tower. Once again use a fluid identifier to set the fractioning tower's input type, then connect it with the refinery.<br><br>This process will yield the following fluids:<br>[[Petroleum Gas]] (for plastics and various other uses)<br>[[Bitumen]] (for asphalt)<br>[[Heating Oil]] (mostly for burning)<br>[[Industrial Oil]] (may be processed into [[petroil|Petroil]])<br>[[Lubricant]] (for various uses)<br>[[Diesel]] (powerful early engine fuel)<br>[[Kerosene]] (powerful fuel)<br><br>These resources enable the creation of some new materials:<br>[[Polymer]] from petroleum gas<br>[[Gasoline]] out of naphtha<br>[[Desh]] using light oil<br>[[LPG]], a compressed form of petroleum gas, powerful fuel<br><br>See also:<br>[[Oil Collection]]<br>[[Advanced Oil Processing]]<br>[[Vacuum Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/guide/oil2.json

@@ -0,0 +1,11 @@
+{
+	"name": "Advanced Oil Processing",
+	"icon": ["hbm:tile.machine_catalytic_cracker", 1, 0],
+	"trigger": [],
+	"title": {
+		"en_US": "Advanced Oil Processing"
+	},
+	"content": {
+		"en_US": "Advanced oil processing (\"Oil 2\") involves turning [[crude oil|Crude Oil]] into [[cracked oil|Cracked Oil]] using a [[catalytic cracking tower|Catalytic Cracking Tower]] and separating it using a [[refinery|Oil Refinery]].<br><br>For this you will need:<br>[[Boiler]]<br>[[External Heat Source]]<br>[[Condenser]]<br>[[Oil Refinery]]<br>[[Catalytic Cracking Tower]]<br>[[Fractioning Tower]]<br><br>Connect your source of crude oil to the cracking tower. Also supply the cracking tower with steam, produced by a boiler. Pipe the resulting low-pressure steam into a condenser, and loop the water back into the boiler (closed loop steam cycle). The cracking tower also creates petroleum gas, ready for use, and cracked oil. Heat the cracked oil in a boiler and pipe it into the refinery. Two of the resulting fluids can be separated further using the fractioning towers.<br><br>This process will yield the following fluids:<br>[[Heating Oil]] (for burning)<br>[[Cracked Diesel]] (a lower power form of [[diesel|Diesel]])<br>[[Kerosene]] (powerful fuel)<br>[[Petroleum Gas]] (for plastics)<br>[[Aromatic Hydrocarbons]] (for plastics and explosives)<br>[[Unsaturated Hydrocarbons]] (for plastics, burns incredibly hot)<br><br>These resources enable the creation of some new materials:<br>[[Rubber]] made from unsaturateds and [[sulfur|Sulfur]]<br>[[Bakelite]] as a cheap [[polymer|Polymer]] substitute<br>[[TNT]] from aromatics<br>[[C4]] from unsaturateds<br><br>The [[coker unit|Coker Unit]] (\"Oil 2.5\") can turn many oil products into [[petroleum coke|Coke]] with a byproduct, these byproducts can often be processed into cracked oil derivatives.<br><br>See also:<br>[[Oil Collection]]<br>[[Basic Oil Processing]]<br>[[Vacuum Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/guide/oil3.json

@@ -0,0 +1,11 @@
+{
+	"name": "Vacuum Oil Processing",
+	"icon": ["hbm:tile.machine_vacuum_distill", 1, 0],
+	"trigger": [],
+	"title": {
+		"en_US": "Vacuum Oil Processing"
+	},
+	"content": {
+		"en_US": "Vacuum oil processing (\"Oil 3\") requires [[oil|Crude Oil]] to be [[compressed|Compressor]] and then processed in a [[vacuum refinery|Vacuum Refinery]]. Due to the refinery requiring [[bismuth|Bismuth]] to be made, vacuum refining can only be done once an [[RBMK]] has been built.<br><br>For this you will need:<br>Two [[compressors|Compressor]]<br>[[Vacuum Refinery]]<br>[[Fractioning Tower]]<br><br>Connect your source of crude oil to a compressor, then connect that compressor to a second compressor configured to \"1 PU -> 2PU\". This compressed crude oil then has to be piped into the vacuum refinery. Like before, most of the results can be fractioned again using the fractioning towers.<br><br>This process will yield the following fluids:<br>[[Heavy Heating Oil]] for burning<br>[[Reformate]] as blending stock for high-power fuels<br>[[BTX]] for making [[hard plastic|Hard Plastic]] and [[fullerite|Fullerite]]<br>[[Sour Gas]] for [[TATB]] or as a source of [[sulfur|Sulfur]]<br>[[Reformate Gas]] as a powerful fuel, for [[saturnite|Saturnite]] and late-game welding<br><br>These resources enable the creation of some new materials:<br>[[Hard Plastic]] made from BTX<br>[[TATB]] as a better form of [[TNT]] used in nuclear bombs<br>[[Saturnite]] for making weapon parts<br><br>Once [[bismuth|Bismuth]] has been obtained, different paths to making vacuum oils become available (\"Oil 3.5\"). The [[hydrotreater|Hydrotreater]] can use [[hydrogen|Hydrogen]] to turn cracked oil products into their non-cracked counterparts, or desulfurize oil which can be processed in a standard [[refinery|Oil Refinery]] to make vacuum oil products. The [[cytalytic reformer|Catalytic Reformer]] can process less valuable oils into more desirable ones like reformate, reformate gas, aromatic hydrocarbons and petroleum gas.<br><br>See also:<br>[[Oil Collection]]<br>[[Basic Oil Processing]]<br>[[Advanced Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/machine/coker.json

@@ -0,0 +1,11 @@
+{
+	"name": "Coker Unit",
+	"icon": ["hbm:tile.machine_coker", 1, 0],
+	"trigger": [["hbm:tile.machine_coker"]],
+	"title": {
+		"en_US": "Coker Unit"
+	},
+	"content": {
+		"en_US": "Can turn many types of oil into [[petroleum coke|Coke]] at varying efficiencies. Usually produces an oil byproduct, which can be processed into [[cracked oil derivatives|Advanced Oil Processing]]. Requires an [[external heat source|External Heat Source]]."
+	}
+}

src/main/resources/assets/hbm/manual/machine/condenser.json

@@ -0,0 +1,11 @@
+{
+	"name": "Condenser",
+	"icon": ["hbm:tile.machine_condenser", 1, 0],
+	"trigger": [["hbm:tile.machine_condenser"], ["hbm:tile.machine_condenser_powered"], ["hbm:tile.machine_tower_small"], ["hbm:tile.machine_tower_large"]],
+	"title": {
+		"en_US": "Condenser"
+	},
+	"content": {
+		"en_US": "Turns [[low-pressure steam|Low-Pressure Steam]] back into water. A small condenser can handle 100mB/t, an auxiliary cooling tower 1,000mb/t, a large cooling tower 10,000mB/t and a high-power condenser 1,000,000mB/t. The high-power condenser needs electricity to work, all other condensers work passively.<br><br>An important part of any closed steam cycle, for example for [[steam engines|Steam Engine]], [[cracking towers|Catalytic Cracking Tower]] or most nuclear reactors."
+	}
+}

src/main/resources/assets/hbm/manual/machine/crackingtower.json

@@ -0,0 +1,11 @@
+{
+	"name": "Catalytic Cracking Tower",
+	"icon": ["hbm:tile.machine_catalytic_cracker", 1, 0],
+	"trigger": [["hbm:tile.machine_catalytic_cracker"]],
+	"title": {
+		"en_US": "Catalytic Cracking Tower"
+	},
+	"content": {
+		"en_US": "Vital for [[advanced oil processing|Advanced Oil Processing]]. Right-click with a fluid identifier to set the input type. Requires [[steam|Steam]] to work, outputs [[low-pressure steam|Low-Pressure Steam]] in addition to its oil output. Mainly used for cracking [[crude oil|Crude Oil]] into [[cracked oil|Cracked Oil]], but can also convert many other types of petrochemicals."
+	}
+}

src/main/resources/assets/hbm/manual/machine/derrick.json

@@ -0,0 +1,11 @@
+{
+	"name": "Derrick",
+	"icon": ["hbm:tile.machine_well", 1, 0],
+	"trigger": [["hbm:tile.machine_well"]],
+	"title": {
+		"en_US": "Oil Derrick"
+	},
+	"content": {
+		"en_US": "The cheapest way of extracting [[oil|Crude Oil]]. When placed on top of an [[oil depsoit|Oil Collection]] and powered, it will slowly drill down and pump up oil and [[natural gas|Natural Gas]]. A less powerful version of the [[pumpjack|Pumpjack]].<br><br>A green indicator means that the derrick is currently drilling or pumping up oil. A red indicator means that the drill is jammed, the tanks are full or the derrick is out of power. A crossed out droplet means that the derrick's drill has reached the max depth, and there's no oil to gather.<br><br>See also:<br>[[Basic Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/machine/fracker.json

@@ -0,0 +1,11 @@
+{
+	"name": "Hydraulic Fracking Tower",
+	"icon": ["hbm:tile.machine_fracking_tower", 1, 0],
+	"trigger": [["hbm:tile.machine_fracking_tower"]],
+	"title": {
+		"en_US": "Hydraulic Fracking Tower"
+	},
+	"content": {
+		"en_US": "The fastest and most efficient way of collecting [[oil|Crude Oil]] from an [[oil deposit|Oil Collection]], compared to a [[derrick|Derrick]] or [[pumpjack|Pumpjack]].<br><br>Using it like this is not advised though, as the fracking tower's main advantage is being able to access bedrock oil deposits. Pumping oil out of bedrock deposits is slower, but these deposts will bever deplete.<br><br>Requires [[fracking solution|Fracking Solution]] in addition to large amounts of power to work, even when using it on regular oil deposits.<br><br>Caustion: May alter the landscape a little bit.<br><br>See also:<br>[[Basic Oil Processing]]<br>[[Advanced Oil Processing]]<br>[[Vacuum Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/machine/fractioning.json

@@ -0,0 +1,11 @@
+{
+	"name": "Fractioning Tower",
+	"icon": ["hbm:tile.machine_fraction_tower", 1, 0],
+	"trigger": [["hbm:tile.machine_fraction_tower"]],
+	"title": {
+		"en_US": "Fractioning Tower"
+	},
+	"content": {
+		"en_US": "Used in many refining processes to extend the [[refinery's|Oil Refinery]] variety of outputs. Splits one fluid into exactly two output fluids. Right-click with a fluid identifier to set the input type. Stacking multiple fractioning towers will combine them, the type has to be set on the lowest one. Input oil travels upwards and output oil travels downwards, so it is advised to always connect pipes to the bottom tower segment. Segments can be split using fraction tower spacers.<br><br>See also:<br>[[Basic Oil Processing]]<br>[[Advanced Oil Processing]]<br>[[Vacuum Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/machine/heatexchanger.json

@@ -0,0 +1,11 @@
+{
+	"name": "Heat Exchanging Heater",
+	"icon": ["hbm:tile.heater_heatex", 1, 0],
+	"trigger": [["hbm:tile.heater_heatex"]],
+	"title": {
+		"en_US": "Heat Exchanging Heater"
+	},
+	"content": {
+		"en_US": "Powerful [[external heat source|External Heat Source]] usually used by nuclear reactory that employ a form of [[coolant|Perfluoromethyl]] instead of making [[steam|Steam]] outright. Produces usable heats by using hot fluids and cooling them down in the process.<br><br>The top field in the GUI is for the amount of fluid used per cycle, the bottom field is for the tick delay between cycles for fine-tuning."
+	}
+}

src/main/resources/assets/hbm/manual/machine/pumpjack.json

@@ -0,0 +1,11 @@
+{
+	"name": "Pumpjack",
+	"icon": ["hbm:tile.machine_pumpjack", 1, 0],
+	"trigger": [["hbm:tile.machine_pumpjack"]],
+	"title": {
+		"en_US": "Pumpjack"
+	},
+	"content": {
+		"en_US": "A faster and more efficient way of extracting [[oil|Crude Oil]]. When placed on top of an [[oil depsoit|Oil Collection]] and powered, it will slowly drill down and pump up oil and [[natural gas|Natural Gas]]. A more powerful version of the [[oil derrick|Derrick]].<br><br>A green indicator means that the derrick is currently drilling or pumping up oil. A red indicator means that the drill is jammed, the tanks are full or the derrick is out of power. A crossed out droplet means that the derrick's drill has reached the max depth, and there's no oil to gather.<br><br>See also:<br>[[Basic Oil Processing]]"
+	}
+}

src/main/resources/assets/hbm/manual/machine/pyrooven.json

@@ -0,0 +1,11 @@
+{
+	"name": "Pyrolysis Oven",
+	"icon": ["hbm:tile.machine_pyrooven", 1, 0],
+	"trigger": [["hbm:tile.machine_pyrooven"]],
+	"title": {
+		"en_US": "Pyrolysis Oven"
+	},
+	"content": {
+		"en_US": "A machine available after [[vacuum oil processing|Vacuum Oil Processing]] which plays a similar role as the [[coker unit|Coker Unit]]. Instead of [[petroleum coke|Coke]], it makes the more powerful [[solid fuel|Solid Fuel]]. Also has several recipes for [[bedrock ore processing|Bedrock Ore]] shared with the [[combination oven|Combination Oven]], for making [[syngas|Syngas]], and for making [[fine soot|Ashpit]]."
+	}
+}

src/main/resources/assets/hbm/manual/machine/refinery.json

@@ -0,0 +1,11 @@
+{
+	"name": "Oil Refinery",
+	"icon": ["hbm:tile.machine_refinery", 1, 0],
+	"trigger": [["hbm:tile.machine_refinery"]],
+	"title": {
+		"en_US": "Oil Refinery"
+	},
+	"content": {
+		"en_US": "Used for [[processing|Basic Oil Processing]] either [[crude oil|Crude Oil]] or [[cracked oil|Cracked Oil]]. Oil needs to be heated in a [[boiler|Boiler]] beforehand. Has four fluid outputs and one solid output."
+	}
+}

src/main/resources/assets/hbm/manual/machine/steelfurnace.json

@@ -0,0 +1,11 @@
+{
+	"name": "Steel Furnace",
+	"icon": ["hbm:tile.furnace_steel", 1, 0],
+	"trigger": [["hbm:tile.furnace_steel"]],
+	"title": {
+		"en_US": "Steel Furnace"
+	},
+	"content": {
+		"en_US": "A furnace powered by an [[external heat source|External Heat Source]]. Can run three recipes at the same time. Certain recipes, like smelting ores or logs, have a bonus output, indicated by the small meter below the progress bar. Not particularly fast due to the heat transfer limitation, but very versatile."
+	}
+}

src/main/resources/assets/hbm/manual/machine/stirling.json

@@ -0,0 +1,11 @@
+{
+	"name": "Stirling Engine",
+	"icon": ["hbm:tile.machine_stirling", 1, 0],
+	"trigger": [["hbm:tile.machine_stirling"], ["hbm:tile.machine_stirling_steel"]],
+	"title": {
+		"en_US": "Stirling Engine"
+	},
+	"content": {
+		"en_US": "Early machine for turning [[TU|External Heat Source]] directly into energy. Has low efficiency, and can only accept limited amounts of heat. Too much heat will cause the machine to violently disassemble. Detached parts can be collected and slotted back into the machine.<br><br>A step up from the [[wood burner|Wood-Burning Generator]], but not by much."
+	}
+}

src/main/resources/assets/hbm/manual/material/bakelite.json

@@ -9,9 +9,9 @@
 		"zh_CN": "电木"
 	},
 	"content": {
-		"en_US": "Alternative to [[polymer|Polymer]] made from [[aromatic hydrocarbons|Aromatic Hydrocarbons]] derived from [[cracked oil products|Catalytic Cracking Tower]]. Completely interchangeable in all recipes.",
-		"uk_UA": "Карболіт (радянська назва бакеліту) — альтернатива [[полімеру|Polymer]], виготовлений з [[ароматичних вуглеводнів|Aromatic Hydrocarbons]], отриманих з [[продуктів крекінгу нафти|Catalytic Cracking Tower]]. Повністю взаємозамінний у всіх рецептах.",
-		"ru_RU": "Альтернатива [[полимеру|Polymer]], изготовленная из [[ароматических углеводородов|Aromatic Hydrocarbons]], полученных из [[продуктов крекинга нефти|Catalytic Cracking Tower]]. Полностью взаимозаменяема во всех рецептах.",
-		"zh_CN": "[[聚合物|Polymer]]的替代品，使用处理[[裂化油|Catalytic Cracking Tower]]得到的产品之一[[芳香烃|Aromatic Hydrocarbons]]制作。在所有配方中与聚合物完全通用。"
+		"en_US": "Alternative to [[polymer|Polymer]] made from [[aromatic hydrocarbons|Aromatic Hydrocarbons]] derived from [[cracked oil products|Advanced Oil Processing]]. Completely interchangeable in all recipes.",
+		"uk_UA": "Карболіт (радянська назва бакеліту) — альтернатива [[полімеру|Polymer]], виготовлений з [[ароматичних вуглеводнів|Aromatic Hydrocarbons]], отриманих з [[продуктів крекінгу нафти|Advanced Oil Processing]]. Повністю взаємозамінний у всіх рецептах.",
+		"ru_RU": "Альтернатива [[полимеру|Polymer]], изготовленная из [[ароматических углеводородов|Aromatic Hydrocarbons]], полученных из [[продуктов крекинга нефти|Advanced Oil Processing]]. Полностью взаимозаменяема во всех рецептах.",
+		"zh_CN": "[[聚合物|Polymer]]的替代品，使用处理[[裂化油|Advanced Oil Processing]]得到的产品之一[[芳香烃|Aromatic Hydrocarbons]]制作。在所有配方中与聚合物完全通用。"
 	}
 }

src/main/resources/assets/hbm/manual/material/coke.json

@@ -9,9 +9,9 @@
 		"zh_CN": "焦炭"
 	},
 	"content": {
-		"en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].<br><br>Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.<br><br>Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.<br><br>Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]].",
-		"uk_UA": "Високочистий вуглець, має вдвічі вищу горючість, ніж вугілля. Може бути зпресований у [[графіт|Graphite]], використовується у різних рецептах [[сталі|Steel]] або як джерело вуглецю для [[ливарні|Crucible]].<br><br>Вугільний кокс можна виготовляти шляхом обсмаження вугільних брикетів або коксування вугілля в різних його формах.<br><br>Буровугільний кокс виготовляється з набагато дешевшого та менш потужного бурого вугілля майже таким самим способом, незважаючи на це, він має ті ж характеристики.<br><br>Нафтовий кокс виготовляється або з невугільних смол у [[коксовій печі|Combination Oven]], або шляхом коксування різних видів нафтопродуктів у [[коксовій установці|Coking Unit]].",
-		"ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].<br><br>Угольный кокс можно получить путём переплавки угольных брикетов или комбинированной переплавки угля в различных формах.<br><br>Бурый кокс изготавливается из более дешёвого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.<br><br>Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путём коксования различных видов масла в [[коксовой установке|Coking Unit]].",
-		"zh_CN": "高纯度的碳，其热值为煤炭的两倍。可被锻压为[[石墨|Graphite]]，也可用于多种炼[[钢|Steel]]配方或作为[[坩埚|Crucible]]中碳的来源。<br><br>煤焦炭可通过在熔炉中烧炼煤球获取，或在复式炼焦炉中炼焦各种形式的煤炭获取。<br><br>褐煤焦炭可以以更廉价且品质更低的褐煤为原料，通过相同的方式获取， 尽管其特性与煤焦炭完全相同。<br><br>石油焦炭可通过在[[复式炼焦炉|Combination Oven]]中炼焦焦油（煤焦油除外）获取，也可通过在[[焦化装置|Coking Unit]]中焦化多种油获取。"
+		"en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].<br><br>Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.<br><br>Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.<br><br>Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coker Unit]].",
+		"uk_UA": "Високочистий вуглець, має вдвічі вищу горючість, ніж вугілля. Може бути зпресований у [[графіт|Graphite]], використовується у різних рецептах [[сталі|Steel]] або як джерело вуглецю для [[ливарні|Crucible]].<br><br>Вугільний кокс можна виготовляти шляхом обсмаження вугільних брикетів або коксування вугілля в різних його формах.<br><br>Буровугільний кокс виготовляється з набагато дешевшого та менш потужного бурого вугілля майже таким самим способом, незважаючи на це, він має ті ж характеристики.<br><br>Нафтовий кокс виготовляється або з невугільних смол у [[коксовій печі|Combination Oven]], або шляхом коксування різних видів нафтопродуктів у [[коксовій установці|Coker Unit]].",
+		"ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].<br><br>Угольный кокс можно получить путём переплавки угольных брикетов или комбинированной переплавки угля в различных формах.<br><br>Бурый кокс изготавливается из более дешёвого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.<br><br>Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путём коксования различных видов масла в [[коксовой установке|Coker Unit]].",
+		"zh_CN": "高纯度的碳，其热值为煤炭的两倍。可被锻压为[[石墨|Graphite]]，也可用于多种炼[[钢|Steel]]配方或作为[[坩埚|Crucible]]中碳的来源。<br><br>煤焦炭可通过在熔炉中烧炼煤球获取，或在复式炼焦炉中炼焦各种形式的煤炭获取。<br><br>褐煤焦炭可以以更廉价且品质更低的褐煤为原料，通过相同的方式获取， 尽管其特性与煤焦炭完全相同。<br><br>石油焦炭可通过在[[复式炼焦炉|Combination Oven]]中炼焦焦油（煤焦油除外）获取，也可通过在[[焦化装置|Coker Unit]]中焦化多种油获取。"
 	}
 }

src/main/resources/assets/hbm/manual/material/polymer.json

@@ -9,7 +9,7 @@
 		"zh_CN": "聚合物"
 	},
 	"content": {
-		"en_US": "Polymer ('Teflon') is the first available type of plastic. Requires [[petroleum gas|Petroleum Gas]] and therefore [[oil processing|Crude Oil]].<br><br>Fully interchangable with [[Bakelite]], which becomes available after [[oil cracking|Catalytic Cracking Tower]].",
+		"en_US": "Polymer ('Teflon') is the first available type of plastic. Requires [[petroleum gas|Petroleum Gas]] and therefore [[oil processing|Basic Oil Processing]].<br><br>Fully interchangable with [[Bakelite]], which becomes available after [[oil cracking|Catalytic Cracking Tower]].",
 		"uk_UA": "Полімер ('Тефлон') – це перший доступний тип пластику. потребує [[нафтовий газ|Petroleum Gas]], а отже, [[переробку нафти|Crude Oil]].<br><br>Повністю взаємозамінний з [[карболітом|Bakelite]], який стає доступним після [[крекінгу нафти|Catalytic Cracking Tower]].",
 		"ru_RU": "Полимер ('Тефлон') — первый доступный тип пластика. Требует [[нефтяного газа|Petroleum Gas]] и, следовательно, [[переработки нефти|Crude Oil]].<br><br>Полностью взаимозаменяем с [[бакелитом|Bakelite]], который становится доступным после [[крекинга нефти|Catalytic Cracking Tower]].",
 		"zh_CN": "聚合物（“特氟龙”）是第一种可获取的塑料。需要[[石油气|Petroleum Gas]]制作，因此需要 [[原油处理|Crude Oil]]。和[[电木|Bakelite]]完全通用，后者在获得[[催化裂化塔|Catalytic Cracking Tower]]后才可制作。"

src/main/resources/assets/hbm/manual/material/solidfuel.json

@@ -0,0 +1,11 @@
+{
+	"name": "Solid Fuel",
+	"icon": ["hbm:item.solid_fuel", 1, 0],
+	"trigger": [["hbm:item.solid_fuel"]],
+	"title": {
+		"en_US": "Solid Fuel"
+	},
+	"content": {
+		"en_US": "Oil in a solid, conveniently cuboid form. Burns twice as long as coal and way hotter. Commonly made in a [[solidifier|Solidifier]] or [[pyrolysis oven|Pyrolysis Oven]]. Used in solid rocket propellant."
+	}
+}