Commit Graph
2226 Commits
Author SHA1 Message Date
Bernhard Bonigl c3d72efc81 If we're sending smeltery updates like that already, we might as well also send the status. Client should always be synchronized now. 2014-09-16 16:57:51 +02:00
Bernhard Bonigl 774328a1e6 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-16 00:20:16 +02:00
Bernhard Bonigl 41ad4004ff Fixe smeltery derp that caused smeltery to not feel very smeltery-like. 2014-09-16 00:20:08 +02:00
boni cbc345f073 Merge pull request #980 from Adaptivity/patch-2
Update ru_RU.lang
2014-09-15 22:54:24 +02:00
Bernhard Bonigl 6205894215 Add those localization changes for custom names to bow and arrow as well. 2014-09-15 22:53:23 +02:00
Anton 361fe633df Update ru_RU.lang 2014-09-15 17:03:47 +04:00
Bernhard Bonigl a1e2a292b0 Possible dupe bug fix: Put items from basins/tables into the inventory instead of dropping them. 2014-09-15 12:43:57 +02:00
Bernhard Bonigl a4aa66b9bc Fix crash with casting table caused by changes before 2014-09-15 12:35:59 +02:00
Bernhard Bonigl bd706b8378 Smooth liquid change rendering in basins and tables, not only when it's done 2014-09-15 12:35:33 +02:00
Bernhard Bonigl 463ff0478d Move interaction with items of casting basin/table to logic 2014-09-15 12:23:05 +02:00
Bernhard Bonigl bdce6310ae Fix Faucet pouring rendering with nether smeltery stuff 2014-09-15 12:21:52 +02:00
Bernhard Bonigl 3f4e2706a3 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-15 12:21:30 +02:00
Bernhard Bonigl 6f9d55741c Fix rendering of empty tank items 2014-09-15 11:52:50 +02:00
boni 33ab1c0fc5 Merge pull request #977 from micdoodle8/master
Fix OpenGL blend state causing dark inventory slots.
2014-09-15 09:01:43 +02:00
mDiyo 6c9fcee3a9 Update TE4Helper.java 2014-09-14 16:17:27 -07:00
Mitchell Petrie f093c3da17 Fix OpenGL blend state causing dark inventory slots. 2014-09-14 17:43:24 -04:00
boni 0b82f7d170 Merge pull request #972 from Mrkwtkr/patch-2
Update zh_CN.lang
2014-09-14 20:17:23 +02:00
boni 72fdecbfd2 Merge pull request #973 from Qowyn/loc-patch
Loc patch
2014-09-14 20:16:10 +02:00
Bernhard Bonigl cf37c927c6 Merge branch 'master' of https://github.com/Techjar/TinkersConstruct 2014-09-14 20:05:22 +02:00
Bernhard Bonigl 4e5011f7fe Seared Tank/Glass/Window now render their liquids in inventory! yay! 2014-09-14 20:04:07 +02:00
Qowyn fd4c0cfe1c Use default name for tool subItems 2014-09-13 22:34:12 +02:00
Qowyn 7ae5a92a8f Feature #954: Custom names for specific toolpart and material combinations and tool default names 2014-09-13 22:22:11 +02:00
Mrkwtkr 3a872c679e Update zh_CN.lang 2014-09-13 22:54:20 +08:00
Techjar 778c764cf2 Defer ore dict smeltery recipes until postInit
We can't be sure the ore dictionary has been fully registered by other mods due to load order, so we should wait until postInit to ensure it has all registrations, otherwise some ore dictionary items may not get registered.
2014-09-12 23:48:53 -04:00
Bernhard Bonigl 593af6be17 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-12 16:56:43 +02:00
Bernhard Bonigl ba99b9af24 Fix smelteries doing stuff while they're actually broken. 2014-09-12 16:56:35 +02:00
Arthur Uzulin 3d028e7123 Made battlesigns have editable text 2014-09-12 23:59:13 +10:00
Bernhard Bonigl fc0d73dbf6 Fix Smelteries not updating their current capacity sometimes. Should fix capacity problems. 2014-09-12 15:46:09 +02:00
Bernhard Bonigl eff9bbe325 Fix molten cobalt localization (I thought I already fixed that before?) 2014-09-12 15:36:11 +02:00
Bernhard Bonigl fc5e0096fe Change smeltery-capacity to 10 ingots per block, because 18 really is way too much diyo :P 2014-09-12 15:34:56 +02:00
Bernhard Bonigl 9fabcc0a20 Fix clicking fluids in the smeltery 2014-09-12 15:34:25 +02:00
Bernhard Bonigl 48f9059217 Fluid Capacity of smelteries depends on size. Fix Fluid-Rendering in GUI. 2014-09-12 00:38:44 +02:00
Bernhard Bonigl 8ab25cae4a Fix entity detection in smelteries 2014-09-11 23:45:12 +02:00
Bernhard Bonigl 448d29e5a2 Remove the old smeltery stuff that was meant for comatibility, because it's too complicated to separately keep it in. 2014-09-11 23:26:30 +02:00
Bernhard Bonigl cdd28f6412 Fix smeltery structure detection having inconsistant sizes 2014-09-11 23:17:28 +02:00
Bernhard Bonigl 6bbd392c4f Render blocks and fluids inside of smelteries according to size (exactly the same behaviour as with the old 3x3 smeltery) 2014-09-11 22:58:57 +02:00
Bernhard Bonigl 13f1b63965 Highlight for the scroll bar 2014-09-11 22:09:27 +02:00
Bernhard Bonigl 711fe0d716 Display a 4-columns GUI if the smeltery has >16 blocks per layer 2014-09-11 18:34:08 +02:00
Bernhard Bonigl 24e0e9fcc3 Smeltery-Gui for the flexible smeltery and some gui polishing 2014-09-11 17:46:53 +02:00
Bernhard Bonigl 7c4c9b55c0 Fix smeltery gui scrolling 2014-09-11 17:24:30 +02:00
Bernhard Bonigl 9818edc0a8 Move the old smelterylogic implementation to backup classes for a compatibility config. Change most logic to take actual smeltery size into account. 2014-09-11 16:49:28 +02:00
Bernhard Bonigl c0ad340460 Start a flexible smeltery implementation that allows rectangular smelteries. Logic works \o/. UI missing. :( 2014-09-11 15:45:15 +02:00
Bernhard Bonigl 103778e316 Unify Casting Table/Basin logic and fix the canDrain/canFill stuff. #963 2014-09-11 12:09:15 +02:00
Bernhard Bonigl 5cc701ff27 Fix dupe-bug-fix with fluid draining from casting blocks.. 2014-09-11 11:16:55 +02:00
Bernhard Bonigl a489b67259 Zombie Flesh can be melted for 5mb of blood. Blood balls can also be melted back down. 2014-09-10 19:01:39 +02:00
Bernhard Bonigl 7c8965adbf Fix whitespaces in material localization strings, and allow custom localization strings. 2014-09-10 18:39:06 +02:00
radfast 67fe457257 Fix knapsack tab rendering. Courtesy to @radfast 2014-09-10 11:24:51 +02:00
Bernhard Bonigl 91e01087ee Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-10 00:45:22 +02:00
Bernhard Bonigl ce9a0133a8 Disable Knuckles modifier since it doesn't do anything currently :S 2014-09-10 00:42:15 +02:00
Bernhard Bonigl d9c3f26f83 Disable hitbox changes of Perfect Dodge if Smart Moving is present. Yes, this makes the modifier useless with smart moving. 2014-09-10 00:39:07 +02:00