mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
2776a6f347
# Conflicts: # src/main/java/com/hbm/blocks/ModBlocks.java # src/main/java/com/hbm/handler/EntityEffectHandler.java # src/main/java/com/hbm/main/ClientProxy.java # src/main/java/com/hbm/main/CraftingManager.java # src/main/java/com/hbm/main/MainRegistry.java # src/main/java/com/hbm/main/ModEventHandlerClient.java # src/main/java/com/hbm/main/ModEventHandlerRenderer.java # src/main/java/com/hbm/main/NEIConfig.java # src/main/java/com/hbm/main/ResourceManager.java # src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java # src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java # src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java # src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java # src/main/java/com/hbm/util/CompatExternal.java # src/main/java/com/hbm/util/CrucibleUtil.java # src/main/java/com/hbm/util/EntityDamageUtil.java