Double Jump + Speed Boost
Charging pad
Merge branch '1.7.10' into 1.7.10_Exosuit_Expansion
Merge branch '1.7.10' into 1.7.10_Exosuit_Expansion
Merge branch '1.7.10' into 1.7.10_Exosuit_Expansion
Testing adding damage proficiencies
More custom plates
More custom plate stoof
Book improvement
More plates
Vanity Slots
Top Hat
Unusual Top Hat
Merge branch 'master' into 1.7.10_Exosuit_Expansion

Conflicts:
	src/main/java/flaxbeard/steamcraft/SteamcraftItems.java
	src/main/java/flaxbeard/steamcraft/api/tile/SteamTransporterTileEntity.java
	src/main/java/flaxbeard/steamcraft/block/BlockBoiler.java
	src/main/java/flaxbeard/steamcraft/integration/ThaumcraftIntegration.java
	src/main/java/flaxbeard/steamcraft/tile/TileEntityBoiler.java
	src/main/java/flaxbeard/steamcraft/tile/TileEntityFlashBoiler.java
	src/main/java/flaxbeard/steamcraft/tile/TileEntityItemMortar.java
	src/main/java/flaxbeard/steamcraft/tile/TileEntitySmasher.java
	src/main/java/flaxbeard/steamcraft/tile/TileEntityThumper.java
	src/main/java/flaxbeard/steamcraft/world/SimplexNoise.java
Part 1 of the MERGE FROM HELL
Pt 2, the MERGE FROM HELL
Merge branch 'master' into 1.7.10_Exosuit_Expansion

Conflicts:
	src/main/java/flaxbeard/steamcraft/Config.java
	src/main/java/flaxbeard/steamcraft/SteamcraftBlocks.java
	src/main/java/flaxbeard/steamcraft/SteamcraftBook.java
	src/main/java/flaxbeard/steamcraft/SteamcraftItems.java
	src/main/java/flaxbeard/steamcraft/SteamcraftRecipes.java
	src/main/java/flaxbeard/steamcraft/api/UtilSteamTransport.java
	src/main/java/flaxbeard/steamcraft/api/block/BlockSteamTransporter.java
	src/main/java/flaxbeard/steamcraft/api/steamnet/SteamNetwork.java
	src/main/java/flaxbeard/steamcraft/api/steamnet/SteamNetworkRegistry.java
	src/main/java/flaxbeard/steamcraft/block/BlockBoiler.java
	src/main/java/flaxbeard/steamcraft/block/BlockFlashBoiler.java
	src/main/java/flaxbeard/steamcraft/block/BlockPipe.java
	src/main/java/flaxbeard/steamcraft/block/BlockPump.java
	src/main/java/flaxbeard/steamcraft/block/BlockSmasher.java
	src/main/java/flaxbeard/steamcraft/block/BlockSteamCharger.java
	src/main/java/flaxbeard/steamcraft/block/BlockSteamHeater.java
	src/main/java/flaxbeard/steamcraft/block/BlockThumper.java
	src/main/java/flaxbeard/steamcraft/block/BlockValvePipe.java
	src/main/java/flaxbeard/steamcraft/client/ClientProxy.java
	src/main/java/flaxbeard/steamcraft/client/render/TileEntitySteamGaugeRenderer.java
	src/main/java/flaxbeard/steamcraft/client/render/model/ModelExosuit.java
	src/main/java/flaxbeard/steamcraft/handler/SteamcraftEventHandler.java
	src/main/java/flaxbeard/steamcraft/handler/SteamcraftTickHandler.java
scroll wheels are great
Steam works. oops
Additional plates