Skip to content
Sign in

Changes

Started 12 yr ago
Took 1 min 18 sec
Fishing rod and items textures from malice936.
( ee700db )
resources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/slime_fishingrod_flail.png resources/assets/tinker/textures/items/parts/slime_bobber.png resources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod_bobber.png resources/assets/tinker/textures/items/parts/ardite_bobber.png resources/assets/tinker/textures/items/fishingrod/iron_fishingrod.png resources/assets/tinker/textures/items/fishingrod/quartz_fishingrod_effect.png resources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod.png resources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/stone_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/lapis_fishingrod_effect.png resources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod.png resources/assets/tinker/textures/items/parts/stone_bobber.png resources/assets/tinker/textures/items/fishingrod/paper_fishingrod.png resources/assets/tinker/textures/items/parts/obsidian_bobber.png resources/assets/tinker/textures/items/fishingrod/steel_fishingrod.png resources/assets/tinker/textures/items/parts/flint_bobber.png resources/assets/tinker/textures/items/fishingrod/bone_fishingrod_bobber.png resources/assets/tinker/textures/items/parts/pigiron_bobber.png resources/assets/tinker/textures/items/parts/wood_bobber.png resources/assets/tinker/textures/items/fishingrod/copper_fishingrod.png resources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/paper_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/ardite_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/wood_fishingrod_bobber.png resources/assets/tinker/textures/items/materials/pattern_bobber.png resources/assets/tinker/textures/items/fishingrod/bronze_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/flamestring_line.png resources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod.png resources/assets/tinker/textures/items/fishingrod/iron_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/bronze_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/ardite_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/stone_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/cactus_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/bone_fishingrod.png resources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/alumite_fishingrod_flail.png resources/assets/tinker/textures/items/parts/blueslime_bobber.png resources/assets/tinker/textures/items/fishingrod/diamond_fishingrod_effect2.png resources/assets/tinker/textures/items/fishingrod/flint_fishingrod.png resources/assets/tinker/textures/items/fishingrod/redstone_fishingrod_effect.png resources/assets/tinker/textures/items/parts/iron_bobber.png resources/assets/tinker/textures/items/fishingrod/cactus_fishingrod.png resources/assets/tinker/textures/items/fishingrod/thaumium_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/copper_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/emerald_fishingrod_effect2.png resources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/wood_fishingrod.png resources/assets/tinker/textures/items/fishingrod/flint_flail.png resources/assets/tinker/textures/items/fishingrod/bronze_fishingrod.png resources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod.png resources/assets/tinker/textures/items/parts/steel_bobber.png resources/assets/tinker/textures/items/fishingrod/ardite_fishingrod.png resources/assets/tinker/textures/items/parts/alumite_bobber.png resources/assets/tinker/textures/items/parts/cactus_bobber.png resources/assets/tinker/textures/items/parts/manyullyn_bobber.png resources/assets/tinker/textures/items/fishingrod/wood_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/blueslime_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/bone_fishingrod_flail.png resources/assets/tinker/textures/items/parts/bone_bobber.png resources/assets/tinker/textures/items/fishingrod/cobalt_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/slime_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/steel_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/cactus_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod.png resources/assets/tinker/textures/items/materials/cast_bobber.png resources/assets/tinker/textures/items/fishingrod/manyullyn_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/emerald_fishingrod_effect1.png resources/assets/tinker/textures/items/fishingrod/steel_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/slime_fishingrod.png resources/assets/tinker/textures/items/fishingrod/flint_fishingrod_bobber.png resources/assets/tinker/textures/items/parts/copper_bobber.png resources/assets/tinker/textures/items/fishingrod/obsidian_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/string_line.png resources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod.png resources/assets/tinker/textures/items/fishingrod/stone_fishingrod.png resources/assets/tinker/textures/items/parts/netherrack_bobber.png resources/assets/tinker/textures/items/fishingrod/iron_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/copper_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/diamond_fishingrod_effect1.png resources/assets/tinker/textures/items/parts/cobalt_bobber.png resources/assets/tinker/textures/items/fishingrod/netherrack_fishingrod_flail.png resources/assets/tinker/textures/items/fishingrod/alumite_fishingrod_bobber.png resources/assets/tinker/textures/items/parts/paper_bobber.png resources/assets/tinker/textures/items/fishingrod/paper_fishingrod_bobber.png resources/assets/tinker/textures/items/fishingrod/magicfabric_line.png resources/assets/tinker/textures/items/fishingrod/pigiron_fishingrod.png resources/assets/tinker/textures/items/fishingrod/alumite_fishingrod.png resources/assets/tinker/textures/items/parts/bronze_bobber.png resources/assets/tinker/textures/items/parts/thaumium_bobber.png
bernhard.bonigl at
Unmerged 1.6.4 commit: Fix heart rendering #918
( fe3a075 )
resources/assets/tinker/textures/gui/newhearts.png src/main/java/tconstruct/armor/ArmorProxyClient.java
bernhard.bonigl at
Fix PR for #933
( 0ae49b6 )
src/main/java/tconstruct/plugins/te4/TinkerTE4.java
bernhard.bonigl at
Unmerged 1.6.4 commit: Casting Channels behave properly with faucets
( b8bdc7d )
src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java
bernhard.bonigl at
Unmerged 1.6.4 change: Move healthbar when experience bar isn't drawn
( 9e263e2 )
src/main/java/tconstruct/armor/ArmorProxyClient.java
bernhard.bonigl at
Unmerged 1.6.4 commit: Fix slime island grass weirdness #921
( 69a14fe )
src/main/java/tconstruct/blocks/slime/SlimeGrass.java
bernhard.bonigl at
Render Bow with ToolCoreRenderer again
( 9432fe7 )
src/main/java/tconstruct/client/CustomBowRenderer.java src/main/java/tconstruct/tools/ToolProxyClient.java src/main/java/tconstruct/client/ToolCoreRenderer.java
bernhard.bonigl at
Fix speed calc in GUI from #934
( 7ca3aca )
src/main/java/tconstruct/tools/gui/ToolStationGui.java src/main/java/tconstruct/tools/gui/CraftingStationGui.java
bernhard.bonigl at
Unify tool speed calculation in one accessible place, instead of having
( 2dd426f )
src/main/java/tconstruct/library/tools/AbilityHelper.java src/main/java/tconstruct/library/tools/HarvestTool.java src/main/java/tconstruct/tools/gui/CraftingStationGui.java src/main/java/tconstruct/tools/gui/ToolStationGui.java
bernhard.bonigl at
Rebase somehow derped. This is f33e7a535ecd3a501307cc41add5d3baa1661950
( 5d83d96 )
src/main/java/tconstruct/client/ToolCoreRenderer.java
bernhard.bonigl at
Unmerged 1.6.4 commits: Various small commits #928
( 3074243 )
src/main/java/tconstruct/smeltery/blocks/SearedBlock.java src/main/java/tconstruct/client/ToolCoreRenderer.java src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
bernhard.bonigl at
Unmerged 1.6.4 commit: TConstruct ingots come first in the Smeltery #929
( 4a0fddc )
src/main/java/tconstruct/util/config/PHConstruct.java src/main/java/tconstruct/smeltery/TinkerSmeltery.java
bernhard.bonigl at
Dense Ore support for the smeltery
( 6e22b71 )
src/main/java/tconstruct/smeltery/TinkerSmeltery.java
bernhard.bonigl at
Render Dagger/Arrow/Bow on the ground correctly
( 409c4ae )
src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java src/main/java/tconstruct/client/ToolCoreRenderer.java
bernhard.bonigl at
Unmerged 1.6.4 commit: Fix King Slime #931
( cada291 )
src/main/java/tconstruct/util/config/PHConstruct.java src/main/java/tconstruct/world/entity/BlueSlime.java src/main/java/tconstruct/world/TinkerWorld.java
bernhard.bonigl at
Fix goofy fluid rendering in smeltery gui
( e488814 )
src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
bernhard.bonigl at
Comparator output on seared tanks and Smeltery
( 5c78471 )
src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java
bernhard.bonigl at
Fix some cobalt and pigiron localization entries
( f427795 )
resources/assets/tinker/lang/en_US.lang resources/assets/tinker/lang/en_PT.lang resources/assets/tinker/lang/de_DE.lang
bernhard.bonigl at