HbmMods 5525318475 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT ...

# Conflicts:
#	assets/hbm/lang/de_DE.lang
#	assets/hbm/lang/en_US.lang
#	assets/hbm/textures/armor/hazmat_paa_1.png
#	assets/hbm/textures/armor/paa_1.png
#	com/hbm/blocks/BlockCrate.java
#	com/hbm/blocks/ModBlocks.java
#	com/hbm/explosion/ExplosionNukeGeneric.java
#	com/hbm/handler/FuelHandler.java
#	com/hbm/items/GunMP.java
#	com/hbm/items/GunRevolver.java
#	com/hbm/items/ItemStarterKit.java
#	com/hbm/items/ModArmor.java
#	com/hbm/items/ModItems.java
#	com/hbm/lib/Library.java
#	com/hbm/lib/RefStrings.java
#	com/hbm/main/ClientProxy.java
#	com/hbm/main/CraftingManager.java
#	com/hbm/main/MainRegistry.java
#	com/hbm/main/ModEventHandlerClient.java
#	com/hbm/sound/MovingSoundPlayerLoop.java
#	com/hbm/sound/MovingSoundXVL1456.java

2016-10-30 20:38:35 +01:00

..

HbmChestContents.java

Fixes, laste features, you name it, it's in here.

2016-10-30 20:08:20 +01:00

HbmWorld.java

Cleaned up heaps of useless crap.

2016-01-15 12:15:44 +01:00

HbmWorldGen.java

Fixes, laste features, you name it, it's in here.

2016-10-30 20:08:20 +01:00

Library.java

Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT

2016-10-30 20:38:35 +01:00

ModDamageSource.java

Fixes, laste features, you name it, it's in here.

2016-10-30 20:08:20 +01:00

RefStrings.java

Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT

2016-10-30 20:38:35 +01:00