upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,157 Commits 6 Branches 324 Tags
b13e2b5340cc50199eef797d5dcae0174c54ec59
Commit Graph
589 Commits
Author SHA1 Message Date
Leon Loeser b13e2b5340 make drain function w/ fluid argument work 2014-09-07 18:47:28 +02:00
Bernhard Bonigl e15bc977c8 Better also make this backwards compatible, in case somebody didn't use the accessors... 2014-09-04 09:28:40 +02:00
Bernhard Bonigl 6ebb746f0b Yet another backwards compatibility fix >_> 2014-09-04 09:26:56 +02:00
Bernhard Bonigl 431e1497bd Use damageDropped to determine meta of dropped block for smelting recipies with autosmelt. #947 2014-09-04 00:19:51 +02:00
Bernhard Bonigl da3c596dd5 Also use ID constant for thaumium. 2014-09-04 00:19:17 +02:00
Bernhard Bonigl f5e245d2a8 Fix backwards compatibility >_< 2014-09-03 14:58:05 +02:00
Bernhard Bonigl 177ae3627b Merge branch 'mat-display-name' of https://github.com/squeek502/TinkersConstruct 
Conflicts:
	src/main/java/tconstruct/library/tools/ToolMaterial.java
 2014-09-03 13:34:26 +02:00
Bernhard Bonigl 1a76b67f69 Code readability 2014-09-03 13:16:22 +02:00
Bernhard Bonigl 7f5ce21e29 Move material-abilities to the language files. They are DISPLAY ONLY. Don't use them for anything else. 2014-09-03 11:50:57 +02:00
Bernhard Bonigl 794e953f01 Move paper handling to event. Refactor code for readabalitiy. 2014-09-03 11:23:50 +02:00
Bernhard Bonigl e05768b801 We can now have constants for the material IDs! No more remembering them by heart! And I'm relatively sure I didn't mix up any IDs. 2014-09-03 10:59:19 +02:00
squeek 97c8789fca Added backwards compatibility to 4c410e 2014-09-02 16:32:49 -07:00
Bernhard Bonigl f6e6798f8d Fire blockbreak event 2014-09-02 17:02:03 +02:00
Bernhard Bonigl 568ed09982 Localize tool names 2014-09-01 23:52:04 +02:00
Bernhard Bonigl 7356bf7c93 Refactor renaming 2014-09-01 23:20:56 +02:00
Bernhard Bonigl 8e5fa1118d Change default tool names to the same as the creative tool names, and still allow renaming. Also unify it for station and forge. 2014-09-01 23:13:05 +02:00
Bernhard Bonigl 4c410e6de6 Localize material names and move the display-prefix to language files 2014-09-01 22:40:00 +02:00
Bernhard Bonigl 6e9dea9bd8 Localization cleanup/fixes 2014-09-01 22:19:43 +02:00
Bernhard Bonigl e632373f62 Prevent King Slime Tool drops from crashing under weird circumstances. 2014-08-31 19:50:59 +02:00
Bernhard Bonigl 0e07f2c4b9 Fix dagger rotation center and allow more flexibility for that stuff. 2014-08-31 19:09:46 +02:00
Bernhard Bonigl 3f536410d8 Fix part builder exploit #939 2014-08-31 17:28:24 +02:00
Bernhard Bonigl ae62aca8bf Support 4-part items in RotatingBase 2014-08-31 17:02:08 +02:00
Bernhard Bonigl ed90124e98 StencilTable: Fix derpyness with stencil saving and free toolrod-stencil with empty stencil table. 2014-08-29 14:44:45 +02:00
Bernhard Bonigl 5c78471fff Comparator output on seared tanks and Smeltery 
Unmerged 164accessory commits #932
 2014-08-28 18:38:18 +02:00
Bernhard Bonigl e4888147db Fix goofy fluid rendering in smeltery gui 
Unmerged 164accessory commits #932
 2014-08-28 17:19:07 +02:00
Bernhard Bonigl cada291012 Unmerged 1.6.4 commit: Fix King Slime #931 2014-08-28 17:16:10 +02:00
Bernhard Bonigl 409c4ae59e Render Dagger/Arrow/Bow on the ground correctly 2014-08-28 16:58:57 +02:00
Bernhard Bonigl 6e22b71e5f Dense Ore support for the smeltery 2014-08-28 16:36:25 +02:00
Bernhard Bonigl 4a0fddcfaf 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.
 2014-08-28 16:32:45 +02:00
Bernhard Bonigl 3074243c56 Unmerged 1.6.4 commits: Various small commits #928 
Nullcheck on detecting entities
Fix missing NBT data crashing toolrenderer
Fix faucet crashing clients
 2014-08-28 14:35:05 +02:00
Bernhard Bonigl 5d83d96d10 Rebase somehow derped. This is f33e7a535e 2014-08-28 14:30:49 +02:00
Bernhard Bonigl 2dd426f1d7 Unify tool speed calculation in one accessible place, instead of having the same code floating around 3 times. 2014-08-28 14:29:12 +02:00
Bernhard Bonigl 7ca3acad88 Fix speed calc in GUI from #934 
Unmerged 1.6.4 commit: Multiple bugfixes #927
 2014-08-28 14:29:08 +02:00
Bernhard Bonigl 9432fe701e Render Bow with ToolCoreRenderer again 
Unmerged 1.6.4 commit: Multiple bugfixes #927
Probably also fixes #912 again
 2014-08-28 14:29:02 +02:00
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
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
squeek 32055da9d1 Re-add dust recipes for Manyullyn and Aluminum Brass 2014-08-27 13:08:01 -07: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 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 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