Skip to content
Jenkins
log in
|
sign up
Dashboard
tehgeek
My Views
All
TConstruct_1.8.9
#172
Back to Project
Status
Changes
Console Output
View Build Information
Polling Log
Git Build Data
See Fingerprints
Open Blue Ocean
Embeddable Build Status
Previous Build
Next Build
Changes
Summary
manual merges of up to 9a578fc (
details
)
Commit
0c9c8100adbfc270b0f91dc926bca5f9a5c2b87d
by
progwml6
manual merges of up to 9a578fc
resources/assets/tinker/textures/items/food/jerky_blood.png
src/main/java/tconstruct/blocks/LavaTankBlock.java
(diff)
src/main/java/tconstruct/common/TContent.java
(diff)
src/main/java/tconstruct/util/config/PHConstruct.java
(diff)
resources/assets/tinker/textures/items/food/edibleblood.png
src/main/java/tconstruct/blocks/ConveyorBase.java
(diff)
src/main/java/tconstruct/common/TRepo.java
(diff)
src/main/java/tconstruct/util/TEventHandler.java
(diff)
resources/assets/tinker/textures/items/food/jerky_blueslime.png
src/main/java/tconstruct/blocks/SearedBlock.java
(diff)
src/main/java/tconstruct/blocks/logic/SmelteryLogic.java
(diff)
src/main/java/tconstruct/common/TRecipes.java
(diff)
src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java
(diff)
resources/assets/tinker/lang/en_US.lang
(diff)
resources/assets/tinker/textures/items/food/edibleslime.png
(diff)
src/main/java/tconstruct/blocks/SoilBlock.java
(diff)
src/main/java/tconstruct/items/MaterialItem.java
(diff)
src/main/java/tconstruct/items/StrangeFood.java
(diff)
src/main/java/tconstruct/items/Jerky.java
(diff)
src/main/java/tconstruct/blocks/SmelteryBlock.java
(diff)
src/main/java/tconstruct/blocks/slime/SlimeGrass.java
(diff)