Commit Graph
2110 Commits
Author SHA1 Message Date
mDiyo 69a14fe08e Unmerged 1.6.4 commit: Fix slime island grass weirdness #921 2014-08-28 12:14:44 +02:00
Bernhard Bonigl 9e263e26de Unmerged 1.6.4 change: Move healthbar when experience bar isn't drawn #919 2014-08-28 11:25:27 +02:00
Bernhard Bonigl b8bdc7da77 Unmerged 1.6.4 commit: Casting Channels behave properly with faucets #917 2014-08-28 11:22:52 +02:00
mDiyo 0ae49b6723 Fix PR for #933 2014-08-28 11:22:30 +02:00
mDiyo fe3a075769 Unmerged 1.6.4 commit: Fix heart rendering #918 2014-08-28 10:49:17 +02:00
boni 52be72de5a Merge pull request #934 from squeek502/broad-tools
Merge: Buff redstone mod, refactor broad tools to match
2014-08-28 10:37:20 +02:00
boni 0cbc341880 Merge pull request #933 from squeek502/dust-recipes
Re-add dust recipes for Manyullyn and Aluminum Brass
2014-08-28 10:35:18 +02:00
Zach fbf7720a05 remove println
Cherry-picked from 3f10d07849d3324a87a297fcc7bed5b63ac00e20
2014-08-28 01:28:03 -07:00
mDiyo 5b56d5e392 Buff redstone mod, refactor broad tools to match
Cherry-picked from 34a4c8c80f969cafd696b41d963c2a041347d4cd

Conflicts:
	src/main/java/tconstruct/common/TProxyCommon.java
	src/main/java/tconstruct/items/tools/Excavator.java
	src/main/java/tconstruct/items/tools/Hammer.java
	src/main/java/tconstruct/items/tools/LumberAxe.java
	src/main/java/tconstruct/library/tools/HarvestTool.java
	src/main/java/tconstruct/modifiers/tools/ModLapis.java
	src/main/java/tconstruct/modifiers/tools/ModRedstone.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
2014-08-28 01:27:39 -07:00
mDiyo 3745feb495 Update en_US.lang 2014-08-27 23:39:06 -08:00
squeek 32055da9d1 Re-add dust recipes for Manyullyn and Aluminum Brass 2014-08-27 13:08:01 -07:00
mDiyo ae31c05f45 Update en_US.lang 2014-08-26 20:37:41 -08:00
Bernhard Bonigl 12cf59eac5 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-08-26 01:10:03 +02:00
mDiyo 0aaf1f5be5 Merge pull request #908 from TheVikingWarrior/patch-12
Updated italian translation and fixed potion launcher's localization
2014-08-25 09:44:35 -08:00
TheVikingWarrior 75d5a23516 Update it_IT.lang 2014-08-25 17:44:32 +02:00
TheVikingWarrior 46e1d46ee3 Update it_IT.lang 2014-08-25 17:08:24 +02:00
TheVikingWarrior 27e2cab467 Update en_US.lang 2014-08-25 16:56:24 +02:00
TheVikingWarrior 8910b3b014 Update it_IT.lang 2014-08-25 16:52:29 +02:00
Bernhard Bonigl a90119b4b9 Make TC-integration require world module for oreberries. Does not fix the TC crash with it though. 2014-08-25 11:35:05 +02:00
Bernhard Bonigl ae5798acf2 Finally add the out-directory to the .gitignore. So annoying. 2014-08-25 10:04:13 +02:00
Bernhard Bonigl f458ed26f0 Move access transformer to a meta-inf folder for FMLAT. Who thought that'd be a good idea. o_O 2014-08-25 09:41:01 +02:00
Bernhard Bonigl 64d6638175 Fix StencilTable always creating a wooden tool rod until button is pressed 2014-08-24 23:09:49 +02:00
Bernhard Bonigl d25e7e97ae Replace SmelteryInput class with mantles ItemMetaWrapper 2014-08-24 22:08:07 +02:00
Bernhard Bonigl 6e5d84ebd0 Update Mantle 2014-08-24 20:50:01 +02:00
Bernhard Bonigl 98d54916cc Do what this todo says and update the FuelGauge when opening smeltery gui. Seems to work quite well? 2014-08-24 20:49:52 +02:00
Bernhard Bonigl 9070c73466 Fix liquids in tanks not rendering their top side if an opaque block is on top. (Relevant for all non-full tanks) 2014-08-24 20:37:52 +02:00
Bernhard Bonigl 1daf7fa248 Change liquid rendering in tanks: Make liquids brighter, and don't draw the flowing texture 2014-08-24 20:17:08 +02:00
Bernhard Bonigl a270c30500 Goodbye coremod. You hopefully wont be missed. 2014-08-24 19:48:46 +02:00
Bernhard Bonigl d59830e7cf Update forge to 1197 2014-08-24 19:31:40 +02:00
Bernhard Bonigl 46d84095cc Send dig packets to synchronize states after breaking blocks. (Should reduce ghost-block problems with AOE tools) 2014-08-23 22:04:49 +02:00
Bernhard Bonigl 699b0f5796 Break blocks on clientside. Eliminates server latency. 2014-08-23 22:04:07 +02:00
Bernhard Bonigl 72e6bce2bf Fix arrows and daggers sometimes rendering as cyan square in inventory/nei 2014-08-23 19:16:33 +02:00
Bernhard Bonigl 175352108e Change how leaf fletchlings are handled to be more general. Basically ALL leaves can be used for leaf fletchlings now. 2014-08-23 11:28:56 +02:00
Bernhard Bonigl 1dd13c5a5f Oredict support for custom materials 2014-08-23 11:27:59 +02:00
Bernhard Bonigl 762f74bc7a Make the light emitted by tanks proportional to how full they are 2014-08-21 22:26:11 +02:00
Bernhard Bonigl 211cb9b2ff Fix tanks not emitting light when they have a glowing liquid. 2014-08-21 22:21:20 +02:00
Bernhard Bonigl 8959a70387 Fix some armor modifiers being applicable to everything, crashing the game. #885 2014-08-21 21:42:44 +02:00
Bernhard Bonigl fa40865f6e Move Creative Tab class to library since it's only used there for the registry. 2014-08-21 21:34:33 +02:00
Bernhard Bonigl ab14d03834 Fix harvest-type being ignored in digspeed-calculation. This meant that hatchets could break ores the same speed as wood blocks, picks wood with the same speed as stone, etc. #897 2014-08-21 21:31:03 +02:00
Bernhard Bonigl d0ce912498 Fix Compressed Gravel not being used up when making brownstone.
Fix Liquid Values required for casting being exponentially too high.
Add a Brownstone Recipe with Tin and Compressed Gravel, since Electrum may not be available.
Change the Electrum recipe to require 1/3 of the liquid as tin.
2014-08-21 21:08:35 +02:00
Bernhard Bonigl 1839c6b7ff Fix those pesky pulsar proxy warnings 2014-08-21 20:47:59 +02:00
Bernhard Bonigl 5b8484d2dc Move golden head to World and fix double-creation that derped the registration. #881 2014-08-21 20:42:13 +02:00
Bernhard Bonigl 9490b1aff6 Add 2x compressed sand to smelting. #880 2014-08-21 20:24:52 +02:00
Bernhard Bonigl 6f5a9235cc Fix compressed cobble giving weird/incorrect amounts of seared stone. #879 2014-08-21 20:16:12 +02:00
Bernhard Bonigl b03b1ac5c8 Make liquid rendering more resilient. Render water if the liquid icons are missing. 2014-08-21 20:01:24 +02:00
Bernhard Bonigl b75bb80340 Fix copy'n'paste bug that made molten electrum not have icons 2014-08-21 20:01:00 +02:00
Bernhard Bonigl efa38e0f76 Temporarily disable alubrass gold-pressure-plate recipe to prevent alubrass->gold exploit 2014-08-21 19:33:17 +02:00
boni af629e4649 Merge pull request #896 from bonii-xx/new_pr
Make Stained Clear Glass Panes use the code of vanilla glass panes.Also...
2014-08-21 17:34:23 +02:00
Bernhard Bonigl de44385a16 Make Stained Clear Glass Panes use the code of vanilla glass panes. Also uses the vanilla stained glass pane renderer now. 2014-08-21 17:33:34 +02:00
mDiyo 94071d05bb Pattern chests keep inventory on harvest 2014-08-21 07:12:33 -08:00