mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
2b3f98a850
# Conflicts: # src/main/resources/assets/hbm/manual/material/alloy.json # src/main/resources/assets/hbm/manual/material/aluminium.json # src/main/resources/assets/hbm/manual/material/arsenic.json # src/main/resources/assets/hbm/manual/material/arsenic_bronze.json # src/main/resources/assets/hbm/manual/material/bakelite.json # src/main/resources/assets/hbm/manual/material/bismuth.json # src/main/resources/assets/hbm/manual/material/bismuth_bronze.json # src/main/resources/assets/hbm/manual/material/bscco.json # src/main/resources/assets/hbm/manual/material/cadmium.json # src/main/resources/assets/hbm/manual/material/cadmium_steel.json # src/main/resources/assets/hbm/manual/material/cinnabar.json # src/main/resources/assets/hbm/manual/material/coke.json # src/main/resources/assets/hbm/manual/material/copper.json # src/main/resources/assets/hbm/manual/material/desh.json # src/main/resources/assets/hbm/manual/material/ferrouranium.json # src/main/resources/assets/hbm/manual/material/graphite.json # src/main/resources/assets/hbm/manual/material/gunmetal.json # src/main/resources/assets/hbm/manual/material/hss.json # src/main/resources/assets/hbm/manual/material/latex.json # src/main/resources/assets/hbm/manual/material/lead.json # src/main/resources/assets/hbm/manual/material/mingrade.json # src/main/resources/assets/hbm/manual/material/neptunium.json # src/main/resources/assets/hbm/manual/material/plutonium-238.json # src/main/resources/assets/hbm/manual/material/plutonium-239.json # src/main/resources/assets/hbm/manual/material/plutonium-240.json # src/main/resources/assets/hbm/manual/material/plutonium-241.json # src/main/resources/assets/hbm/manual/material/plutonium-rg.json # src/main/resources/assets/hbm/manual/material/plutonium.json # src/main/resources/assets/hbm/manual/material/polonium.json # src/main/resources/assets/hbm/manual/material/polymer.json # src/main/resources/assets/hbm/manual/material/radium.json # src/main/resources/assets/hbm/manual/material/rubber.json # src/main/resources/assets/hbm/manual/material/silicon.json # src/main/resources/assets/hbm/manual/material/sodium.json # src/main/resources/assets/hbm/manual/material/steel.json # src/main/resources/assets/hbm/manual/material/sulfur.json # src/main/resources/assets/hbm/manual/material/tantalium.json # src/main/resources/assets/hbm/manual/material/technetium.json # src/main/resources/assets/hbm/manual/material/technetium_steel.json # src/main/resources/assets/hbm/manual/material/thorium.json # src/main/resources/assets/hbm/manual/material/uranium-233.json # src/main/resources/assets/hbm/manual/material/uranium-235.json # src/main/resources/assets/hbm/manual/material/uranium-238.json # src/main/resources/assets/hbm/manual/material/uranium.json # src/main/resources/assets/hbm/manual/material/weaponsteel.json