Skip to content
[Jenkins]Jenkins
log insign up
Success

Changes

Summary

  1. Fishing rod and items textures from malice936. (details)
  2. Unmerged 1.6.4 commit: Fix heart rendering #918 (details)
  3. Fix PR for #933 (details)
  4. Unmerged 1.6.4 commit: Casting Channels behave properly with faucets (details)
  5. Unmerged 1.6.4 change: Move healthbar when experience bar isn't drawn (details)
  6. Unmerged 1.6.4 commit: Fix slime island grass weirdness #921 (details)
  7. Render Bow with ToolCoreRenderer again (details)
  8. Fix speed calc in GUI from #934 (details)
  9. Unify tool speed calculation in one accessible place, instead of having (details)
  10. Rebase somehow derped. This is  f33e7a535ecd3a501307cc41add5d3baa1661950 (details)
  11. Unmerged 1.6.4 commits: Various small commits #928 (details)
  12. Unmerged 1.6.4 commit: TConstruct ingots come first in the Smeltery #929 (details)
  13. Dense Ore support for the smeltery (details)
  14. Render Dagger/Arrow/Bow on the ground correctly (details)
  15. Unmerged 1.6.4 commit: Fix King Slime #931 (details)
  16. Fix goofy fluid rendering in smeltery gui (details)
  17. Comparator output on seared tanks and Smeltery (details)
  18. Fix some cobalt and pigiron localization entries (details)
Commit ee700db039fa933b564acfda8fde58e8a203b376 by bernhard.bonigl
Fishing rod and items textures from malice936.
The file was addedresources/assets/tinker/textures/items/fishingrod/diamond_fishingrod_effect1.png
The file was addedresources/assets/tinker/textures/items/fishingrod/slime_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bronze_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/slime_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bone_fishingrod.png
The file was addedresources/assets/tinker/textures/items/parts/iron_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/flint_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/steel_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/ardite_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/bone_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/paper_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/parts/cobalt_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/wood_fishingrod.png
The file was addedresources/assets/tinker/textures/items/parts/wood_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/alumite_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/copper_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/slime_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/stone_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/flint_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cactus_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/parts/manyullyn_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/paper_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/quartz_fishingrod_effect.png
The file was addedresources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bone_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/alumite_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/paper_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/pigiron_bobber.png
The file was addedresources/assets/tinker/textures/items/materials/cast_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/stone_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/steel_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/parts/copper_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/stone_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/thaumium_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/lapis_fishingrod_effect.png
The file was addedresources/assets/tinker/textures/items/fishingrod/string_line.png
The file was addedresources/assets/tinker/textures/items/parts/ardite_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bronze_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/emerald_fishingrod_effect1.png
The file was addedresources/assets/tinker/textures/items/parts/blueslime_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/stone_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/ardite_fishingrod.png
The file was addedresources/assets/tinker/textures/items/parts/netherrack_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/steel_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cactus_fishingrod.png
The file was addedresources/assets/tinker/textures/items/parts/obsidian_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod.png
The file was addedresources/assets/tinker/textures/items/parts/flint_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/flamestring_line.png
The file was addedresources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/materials/pattern_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/iron_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/wood_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/cactus_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/bronze_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/paper_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bone_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/parts/slime_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/flint_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/wood_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/alumite_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/parts/alumite_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/magicfabric_line.png
The file was addedresources/assets/tinker/textures/items/parts/steel_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/iron_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/emerald_fishingrod_effect2.png
The file was addedresources/assets/tinker/textures/items/fishingrod/bronze_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/copper_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/diamond_fishingrod_effect2.png
The file was addedresources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/iron_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod.png
The file was addedresources/assets/tinker/textures/items/fishingrod/redstone_fishingrod_effect.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/ardite_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/copper_fishingrod_flail.png
The file was addedresources/assets/tinker/textures/items/fishingrod/cactus_fishingrod_bobber.png
The file was addedresources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod_flail.png
Commit fe3a075769beefb3c76bb51949f750f3d9a97219 by bernhard.bonigl
Unmerged 1.6.4 commit: Fix heart rendering #918
The file was modifiedsrc/main/java/tconstruct/armor/ArmorProxyClient.java (diff)
The file was modifiedresources/assets/tinker/textures/gui/newhearts.png (diff)
The file was modifiedsrc/main/java/tconstruct/plugins/te4/TinkerTE4.java (diff)
Commit b8bdc7da770491a5f59a83017758dd967621a601 by bernhard.bonigl
Unmerged 1.6.4 commit: Casting Channels behave properly with faucets #917
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java (diff)
Commit 9e263e26debe353bfd57a6420b7141c94f12f684 by bernhard.bonigl
Unmerged 1.6.4 change: Move healthbar when experience bar isn't drawn #919
The file was modifiedsrc/main/java/tconstruct/armor/ArmorProxyClient.java (diff)
Commit 69a14fe08ecae53838d69cdc7c8a52013a85ee74 by bernhard.bonigl
Unmerged 1.6.4 commit: Fix slime island grass weirdness #921
The file was modifiedsrc/main/java/tconstruct/blocks/slime/SlimeGrass.java (diff)
Commit 9432fe701ee0bc6e2d9c434a171fd6c170784eb5 by bernhard.bonigl
Render Bow with ToolCoreRenderer again
Unmerged 1.6.4 commit: Multiple bugfixes #927
Probably also fixes #912 again
The file was modifiedsrc/main/java/tconstruct/client/ToolCoreRenderer.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/ToolProxyClient.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/CustomBowRenderer.java (diff)
Commit 7ca3acad88f5cb755634be94fd686730e60d0846 by bernhard.bonigl
Fix speed calc in GUI from #934
Unmerged 1.6.4 commit: Multiple bugfixes #927
The file was modifiedsrc/main/java/tconstruct/tools/gui/ToolStationGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/gui/CraftingStationGui.java (diff)
Commit 2dd426f1d7df96d2b056aba12ff68b0ea5f3f6ea by bernhard.bonigl
Unify tool speed calculation in one accessible place, instead of having the same code floating around 3 times.
The file was modifiedsrc/main/java/tconstruct/library/tools/AbilityHelper.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/gui/ToolStationGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/tools/gui/CraftingStationGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/library/tools/HarvestTool.java (diff)
Commit 5d83d96d10d47dcef302a3db0041b481e7ba47c4 by bernhard.bonigl
Rebase somehow derped. This is  f33e7a535ecd3a501307cc41add5d3baa1661950
The file was modifiedsrc/main/java/tconstruct/client/ToolCoreRenderer.java (diff)
Commit 3074243c565f092d3feb6765dfaf55eba3188ed3 by bernhard.bonigl
Unmerged 1.6.4 commits: Various small commits #928
Nullcheck on detecting entities
Fix missing NBT data crashing toolrenderer
Fix faucet crashing clients
The file was modifiedsrc/main/java/tconstruct/smeltery/logic/SmelteryLogic.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/SearedBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/ToolCoreRenderer.java (diff)
Commit 4a0fddcfaff28e98c79ea197b747d14230d27efe by bernhard.bonigl
Unmerged 1.6.4 commit: TConstruct ingots come first in the Smeltery #929
Also implement the config requested by prog for it. Also adds oredict for  block casting.
The file was modifiedsrc/main/java/tconstruct/util/config/PHConstruct.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/TinkerSmeltery.java (diff)
Commit 6e22b71e5f645d0a22628853224d6e11a2845f8e by bernhard.bonigl
Dense Ore support for the smeltery
The file was modifiedsrc/main/java/tconstruct/smeltery/TinkerSmeltery.java (diff)
Commit 409c4ae59ec4452ac7e6757c5129e97901ce6572 by bernhard.bonigl
Render Dagger/Arrow/Bow on the ground correctly
The file was modifiedsrc/main/java/tconstruct/client/ToolCoreRenderer.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java (diff)
Commit cada2910123b7b925958eb0d87b2e1976c14a6da by bernhard.bonigl
Unmerged 1.6.4 commit: Fix King Slime #931
The file was modifiedsrc/main/java/tconstruct/world/TinkerWorld.java (diff)
The file was modifiedsrc/main/java/tconstruct/util/config/PHConstruct.java (diff)
The file was modifiedsrc/main/java/tconstruct/world/entity/BlueSlime.java (diff)
Commit e4888147dbbffcd60845824ed0cd6b6fad6879b6 by bernhard.bonigl
Fix goofy fluid rendering in smeltery gui
Unmerged 164accessory commits #932
The file was modifiedsrc/main/java/tconstruct/smeltery/gui/SmelteryGui.java (diff)
Commit 5c78471fff4f309550694305fb485ef7ea3e211c by bernhard.bonigl
Comparator output on seared tanks and Smeltery
Unmerged 164accessory commits #932
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java (diff)
The file was modifiedsrc/main/java/tconstruct/smeltery/logic/LavaTankLogic.java (diff)
Commit f42779507bf9f02d3ce44bf4d2122c6deba35515 by bernhard.bonigl
Fix some cobalt and pigiron localization entries
The file was modifiedresources/assets/tinker/lang/de_DE.lang (diff)
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
The file was modifiedresources/assets/tinker/lang/en_PT.lang (diff)