Skip to content
[Jenkins]Jenkins
log insign up
Failed

Changes

Summary

  1. add in library jar, use classifier for the type of jar not appendix (details)
  2. cleanup shop (details)
  3. manual merge of master branch changes up to commit 1387bc6 (details)
  4. manual update of all master commits up to ca86fa8 (details)
  5. retire modElectric (details)
  6. update de_DE from master (details)
  7. update to tcon 1.5.1RC1 commits (details)
  8. swap flux into the electric modifiers old spots in the client proxy (details)
  9. update to 1.5.1 RC2 c2cdb7 (details)
Commit 3c0fc6c09221d63598fe89dac42fe76fb96dc05e by progwml6
add in library jar, use classifier for the type of jar not appendix
The file was modifiedbuild.gradle (diff)
The file was removedbuild.xml
The file was removed.gitmodules
Commit 14d357ccf69582128a40f4d0a3269637f32a85c4 by progwml6
manual merge of master branch changes up to commit 1387bc6
The file was modifiedresources/assets/tinker/textures/blocks/compressed_ender.png (diff)
The file was modifiedresources/assets/tinker/textures/blocks/compressed_ardite.png (diff)
The file was modifiedsrc/main/java/tconstruct/client/gui/SmelteryGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/Pattern.java (diff)
The file was modifiedresources/assets/tinker/textures/blocks/compressed_cobalt.png (diff)
The file was addedresources/assets/tinker/textures/blocks/glue.png
The file was modifiedsrc/main/java/tconstruct/blocks/slime/SlimeGel.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/MetalPattern.java (diff)
The file was addedresources/assets/tinker/textures/items/materials/cast_gem.png
The file was modifiedsrc/main/java/tconstruct/blocks/logic/SmelteryLogic.java (diff)
The file was modifiedsrc/main/java/tconstruct/library/client/FluidRenderProperties.java (diff)
The file was modifiedresources/assets/tinker/textures/blocks/compressed_alumite.png (diff)
The file was modifiedsrc/main/java/tconstruct/util/EnvironmentChecks.java (diff)
The file was modifiedresources/assets/tinker/textures/blocks/compressed_manyullyn.png (diff)
The file was addedsrc/main/java/tconstruct/blocks/BloodBlock.java
The file was modifiedsrc/main/java/tconstruct/items/ArmorPattern.java (diff)
The file was modifiedsrc/main/java/tconstruct/util/config/PHConstruct.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TClientEvents.java (diff)
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
The file was addedsrc/main/java/tconstruct/blocks/GlueBlock.java
The file was modifiedresources/assets/tinker/textures/blocks/compressed_alubrass.png (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/TitleIcon.java (diff)
Commit 983c91c2c961f0cf6e82ab2baf4d16315cc72819 by progwml6
manual update of all master commits up to ca86fa8
The file was modifiedsrc/main/java/tconstruct/library/blocks/InventoryLogic.java (diff)
The file was addedsrc/main/java/tconstruct/blocks/GlueFluid.java
The file was modifiedsrc/main/java/tconstruct/items/blocks/OreberryBushItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/blocks/logic/DryingRackLogic.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/MultiBrickItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/library/crafting/FluidType.java (diff)
The file was modifiedsrc/main/java/tconstruct/util/config/PHConstruct.java (diff)
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
The file was modifiedresources/assets/tinker/lang/ru_RU.lang (diff)
The file was addedresources/assets/tinker/textures/items/materials/bucket_glue.png
The file was modifiedsrc/main/java/tconstruct/items/tools/Hammer.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/MetalItemBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/blocks/logic/SmelteryLogic.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/armor/HeartCanister.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/MaterialItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/HamboneItemBlock.java (diff)
The file was addedresources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta
The file was modifiedsrc/main/java/tconstruct/items/blocks/SpeedBlockItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/SpeedSlabItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TClientEvents.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/Manual.java (diff)
The file was addedresources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta
The file was modifiedsrc/main/java/tconstruct/items/FilledBucket.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/GoldenHead.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/tools/PotionLauncher.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/OreBerries.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/armor/Knapsack.java (diff)
The file was addedresources/assets/tinker/textures/blocks/liquid_glue_flow.png
The file was modifiedsrc/main/java/tconstruct/items/ArmorPattern.java (diff)
The file was addedresources/assets/tinker/textures/items/materials/material_glueball.png
The file was modifiedsrc/main/java/tconstruct/items/blocks/SoilSlabItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/gui/StencilTableGui.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/Pattern.java (diff)
The file was modifiedsrc/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java (diff)
The file was modifiedsrc/main/java/tconstruct/blocks/BloodBlock.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/ItemBlockLandmine.java (diff)
The file was modifiedresources/assets/tinker/lang/it_IT.lang (diff)
The file was addedresources/assets/tinker/textures/blocks/liquid_glue.png
The file was modifiedsrc/main/java/tconstruct/items/StrangeFood.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TProxyClient.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/BarricadeItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/library/tools/AbilityHelper.java (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/LavaTankItemBlock.java (diff)
The file was addedsrc/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java
The file was removedsrc/main/java/tconstruct/modifiers/ModElectric.java
The file was removedsrc/api/java/ic2/api/item/ICustomElectricItem.java
The file was modifiedsrc/main/java/tconstruct/util/TEventHandler.java (diff)
The file was removedresources/assets/tinker/textures/items/chisel/electric_chisel_effect.png
The file was removedresources/assets/tinker/textures/items/scythe/electric_scythe_effect.png
The file was modifiedsrc/main/java/tconstruct/items/tools/Shortbow.java (diff)
The file was removedresources/assets/tinker/textures/items/shovel/electric_shovel_effect.png
The file was removedresources/assets/tinker/textures/items/excavator/electric_excavator_effect.png
The file was removedresources/assets/tinker/textures/items/arrow/electric_arrow_effect.png
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was removedresources/assets/tinker/textures/items/dagger/electric_dagger_effect.png
The file was removedresources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png
The file was removedsrc/api/java/ic2/api/item/IElectricItemManager.java
The file was removedresources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png
The file was modifiedsrc/main/java/tconstruct/items/tools/Arrow.java (diff)
The file was removedresources/assets/tinker/textures/items/hammer/electric_hammer_effect.png
The file was removedresources/assets/tinker/textures/items/broadsword/electric_sword_effect.png
The file was removedresources/assets/tinker/textures/items/axe/electric_axe_effect.png
The file was removedresources/assets/tinker/textures/items/shortbow/electric_bow_effect.png
The file was modifiedsrc/main/java/tconstruct/library/armor/ArmorCore.java (diff)
The file was removedresources/assets/tinker/textures/items/longsword/electric_longsword_effect.png
The file was removedsrc/api/java/ic2/api/item/Items.java
The file was removedsrc/api/java/ic2/api/item/IElectricItem.java
The file was removedresources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png
The file was removedresources/assets/tinker/textures/items/rapier/electric_rapier_effect.png
The file was removedresources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png
The file was removedsrc/api/java/ic2/api/item/ISpecialElectricItem.java
The file was removedresources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png
The file was removedresources/assets/tinker/textures/items/mattock/electric_mattock_effect.png
The file was modifiedsrc/main/java/tconstruct/library/tools/ToolCore.java (diff)
The file was removedresources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png
The file was removedresources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png
The file was removedresources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png
The file was removedsrc/api/java/ic2/api/item/IBoxable.java
The file was removedresources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png
The file was removedresources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png
The file was removedresources/assets/tinker/textures/items/frypan/electric_frypan_effect.png
The file was modifiedsrc/main/java/tconstruct/library/tools/AbilityHelper.java (diff)
Commit 6a898f97d779116b3025848c2eb4673dbb9e046a by progwml6
update de_DE from master
The file was modifiedresources/assets/tinker/lang/de_DE.lang (diff)
Commit f2da066da2a90fad74967096a61e0aabebd4f178 by progwml6
update to tcon 1.5.1RC1 commits
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TProxyClient.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/blocks/SmelteryItemBlock.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java (diff)
The file was addedsrc/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/GoldenHead.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java (diff)
The file was modifiedsrc/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/Manual.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was modifiedresources/assets/tinker/lang/en_US.lang (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java (diff)
The file was modifiedresources/assets/tinker/manuals/materials.xml (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java (diff)
The file was addedsrc/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java
The file was modifiedresources/assets/tinker/manuals/smeltery.xml (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java (diff)
The file was addedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java
The file was modifiedsrc/main/java/tconstruct/items/blocks/HamboneItemBlock.java (diff)
The file was addedresources/assets/tinker/textures/items/materials/cast_nugget.png
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java (diff)
The file was modifiedresources/assets/tinker/manuals/firstday.xml (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java (diff)
The file was modifiedsrc/main/java/tconstruct/items/StrangeFood.java (diff)
The file was modifiedsrc/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java (diff)
Commit c429d8e6c5b46eba08adf15a15e021880405b322 by progwml6
swap flux into the electric modifiers old spots in the client proxy
The file was modifiedsrc/main/java/tconstruct/client/TProxyClient.java (diff)
The file was modifiedsrc/main/java/tconstruct/modifiers/ModFlux.java (diff)
Commit f693ee75e0533a25ebd3473cc19b0521a742625a by progwml6
update to 1.5.1 RC2 c2cdb7
The file was modifiedsrc/main/java/tconstruct/TConstruct.java (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/TProxyClient.java (diff)
The file was modifiedsrc/main/java/tconstruct/client/gui/StencilTableGui.java (diff)