[Jenkins]Jenkins

Changes

Summary

  1. Fixed some inconsistencies in how damage/speed of tools is calculated in (details)
  2. Made slab furnaces accept items with the same restrictions as normal (details)
  3. Safer tile entity casting in SearedBlock.getCollisionBoundingBoxFromPool (details)
  4. Fixed repairing only working with the first 2 crafting slots (it will (details)
  5. Fixed multiple repairs being more effective than a single repair with (details)
  6. Fixed the ammo tooltip damage string and give a name to placed frying (details)
  7. Compile fixes for 1.7.10 (details)
  8. Fixed Localizations in Smeltery Tooltip and WAILA (details)
Commit d719885de738f0389c609da8303b146dc529d031 by squeek502
Fixed some inconsistencies in how damage/speed of tools is calculated in GUIs
 * Fixed damage not being calculated properly in Crafting Stations
 * Fixed Crafting Stations stonebound speed calculations (they were using a different algorithm)
 * Fixed typo that made GUIs show the primary mining speed of dual harvest twice
 * Fixed Stonebound damage bonus/loss always being truncated to an int in GUIs

Conflicts:
	src/main/java/tconstruct/tools/gui/CraftingStationGui.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
The file was modifiedsrc/main/java/tconstruct/tools/gui/CraftingStationGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/gui/ToolStationGui.java (diff)
Commit 9b2784719b6846c017c092ce75544dbd7c0255fd by squeek502
Made slab furnaces accept items with the same restrictions as normal furnaces
 * Duplicated ISidedInventory implementation of TileEntityFurnace

Fixes SlimeKnights/TinkersConstruct#573

Conflicts:
	src/main/java/tconstruct/tools/logic/FurnaceLogic.java
The file was modifiedsrc/main/java/tconstruct/tools/logic/FurnaceLogic.java (diff)
Commit 8075cb0b9e8c7a8768c7940fcd1fd3d2d48625e7 by squeek502
Safer tile entity casting in SearedBlock.getCollisionBoundingBoxFromPool

Fixes SlimeKnights/TinkersConstruct#586 and SlimeKnights/TinkersConstruct#557

Conflicts:
	src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/SearedBlock.java (diff)
Commit 4fce1a924e4394277fff34f8d55e627626960551 by squeek502
Fixed repairing only working with the first 2 crafting slots (it will now work with any slot).

Fixes SlimeKnights/TinkersConstruct/#568
The file was modifiedsrc/main/java/tconstruct/modifiers/tools/ModRepair.java (diff)
Commit 443757c28c8772788aedefe9f9f63a683cc69eb8 by squeek502
Fixed multiple repairs being more effective than a single repair with the same amount of materials

Fixes SlimeKnights/TinkersConstruct#584
The file was modifiedsrc/main/java/tconstruct/modifiers/tools/ModRepair.java (diff)
Commit 7afb01afb39d1bd12059176078c8369576df56b7 by squeek502
Fixed the ammo tooltip damage string and give a name to placed frying pans

Conflicts:
	resources/assets/tinker/lang/en_US.lang
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
Commit 4a8ca08facd2b2d69b5a02e5eff20f7142f8d7d9 by squeek502
Compile fixes for 1.7.10
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/SearedBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/logic/FurnaceLogic.java (diff)
Commit 46fbe049207ce300c5b107b9bde8c3aa94d5a8b1 by JeanGlassmaker
Fixed Localizations in Smeltery Tooltip and WAILA
The file was modifiedsrc/main/java/tconstruct/smeltery/gui/SmelteryGui.java (diff)
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
The file was modifiedresources/assets/tinker/lang/it_IT.lang (diff)
The file was modifiedreturning_eventually/plugins/waila/WailaRegistrar.java (diff)