upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-25 20:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,384 Commits 6 Branches 321 Tags
73b25d19f0ef74d99a57591a1a037b7b2adeaea2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernhard Bonigl 73b25d19f0 First merging of weaponry into tinkers 2014-10-05 19:49:26 +02:00
Bernhard Bonigl 6e1ea0e736 Give the materials a bit more.. materialish default color 2014-10-05 18:17:32 +02:00
Bernhard Bonigl f766427522 Fix minimal textures not having modifier textures. (Oops) 2014-10-05 17:47:02 +02:00
Bernhard Bonigl 0430391446 Fix autosmelt smelting even if the black can't be harvested with the tool #1053 2014-10-05 17:42:43 +02:00
Bernhard Bonigl 89796fde81 Fix Tank rendering in inventory with enchanted stuff etc. 2014-10-05 17:35:09 +02:00
Bernhard Bonigl 03755be47d Fix Armor-Moss-Modifier not updating display, so people stop complaining about it not working. 2014-10-05 12:18:21 +02:00
Bernhard Bonigl ed87da1598 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-05 12:03:06 +02:00
Bernhard Bonigl d6cd145baa Fix Smeltery bottom-layers not really being part of the smeltery, therefore not causing updates to the smeltery. 2014-10-05 12:02:49 +02:00
Bernhard Bonigl 0e4691ecfe Fix leftclicking/attacking being processed twice 2014-10-02 15:27:49 +02:00
Bernhard Bonigl d7b560c0ff Prevent crash that sometimes happens when placing a tool/part/stencil whatever station block. 2014-10-01 21:13:27 +02:00
Bernhard Bonigl 968cba4f18 Fix golden carrot/melon gold required 2014-10-01 11:13:35 +02:00
Bernhard Bonigl f902576022 The most important update of the galaxy 2014-10-01 09:41:44 +02:00
Bernhard Bonigl cab2c28595 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-30 19:50:49 +02:00
Bernhard Bonigl f78d8af170 Add a hook for the default color and use it for arrow fletchlings and bowstrings 2014-09-30 19:45:37 +02:00
Bernhard Bonigl 7c3e21be8d Add colors to the custom materials, same as regular tool materials 2014-09-30 19:40:22 +02:00
Bernhard Bonigl 6ca11c5dbf Fix crash from invalid canFill/Drain calls. #1042 2014-09-29 16:53:54 +02:00
Bernhard Bonigl e658348383 Fix the rendering issues in the manual caused by tool rendering 2014-09-29 09:11:38 +02:00
Bernhard Bonigl 15d2cbeae7 Make chisels pop out of the crafting grid if they break 2014-09-29 09:11:15 +02:00
Bernhard Bonigl 6a8c6f0f32 Changed sneaking on AOE tools to break blocks in AOE again. Was only supposed to not chop a whole tree with the lumber axe. 2014-09-28 17:36:40 +02:00
Bernhard Bonigl 62c2956012 Fix a possible division by zero in the NEI plugins. Probably depends on java implementation. #1037 2014-09-28 17:24:31 +02:00
Bernhard Bonigl 457ad128f9 Fix alloys building even though there wasn't enough liquid overall, resulting in liquids with amount 0 in the smeltery. 2014-09-27 12:25:31 +02:00
Bernhard Bonigl 8f833908d6 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-27 10:58:59 +02:00
Bernhard Bonigl c5eb24c239 Fix invar and electrum alloying #1031 2014-09-27 10:31:52 +02:00
Bernhard Bonigl 5ff0c3d58b Fix modifiers on bows rendering with minimal stuff and bla 2014-09-26 18:06:50 +02:00
Bernhard Bonigl a36559b99f Fix bows not using colorable stuff. HRRNGh they are so annoying. 2014-09-26 17:53:14 +02:00
Bernhard Bonigl 1eb4c50fb5 Add a minimal textures option that only uses colored parts and no custom textures for less graphic memory usage. Let's see if this helps. 2014-09-26 17:18:36 +02:00
Bernhard Bonigl 2f80edd655 Dynamic coloring support for toolrods too 2014-09-26 17:18:00 +02:00
Bernhard Bonigl 1f0b88b822 Fix colors 2014-09-26 17:15:33 +02:00
Bernhard Bonigl 66c0b46136 Less huge frypan achievement icon 2014-09-26 17:02:17 +02:00
Bernhard Bonigl cb3742ccbf Fix enchanted items messing up the rendering of tools in inventories 2014-09-26 16:49:39 +02:00
Bernhard Bonigl 0c458ef95d Railcraft poor ore support 2014-09-26 15:11:39 +02:00
Bernhard Bonigl e98ffa46f7 Fix tools without NBT crashing the game in inventories 2014-09-26 14:58:23 +02:00
Bernhard Bonigl 47ee4f4825 Require at least forge 1200 to get rid of all those "stuff doesn't render" problems. 2014-09-26 14:47:05 +02:00
Bernhard Bonigl aaedf04449 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-26 13:35:30 +02:00
Bernhard Bonigl 5283333ad3 Make seared stone easier to acquire, now that smeltery sizes aren't fixed anymore: 1 ingot = 2 cobble, 1 block = 8 cobble 2014-09-26 13:35:23 +02:00
Bernhard Bonigl d0d14c9c98 Give lava the same temperature as the actual liquid (minor speed buff) and make pyrotheum much faster 2014-09-26 13:23:48 +02:00
Bernhard Bonigl 4e5cbd25b7 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-24 18:30:02 +02:00
Bernhard Bonigl 315aac7679 Only set arrow entities dead if they can actually be picked up 2014-09-24 18:29:52 +02:00
Bernhard Bonigl 16fd95d3a2 Tinker Table displays stats of tool in center slot 2014-09-24 11:55:59 +02:00
Bernhard Bonigl 1d4ca5c453 Port ToolStation armor/accessory display stuff to CraftingStation (oh god this is a mess. do it properly in 1.8) 2014-09-24 11:46:25 +02:00
Bernhard Bonigl c38a249a6d Display Armor/Accessories correctly in toolstations/forges 2014-09-24 11:39:56 +02:00
Bernhard Bonigl b91c0cb86c Merge branch 'misc-fixes' of https://github.com/Qowyn/TinkersConstruct 2014-09-24 10:34:35 +02:00
Bernhard Bonigl 9d640c25c7 Only render the accessories for your local client. Accessories are not synced accross clients. #940 2014-09-24 10:05:20 +02:00
Bernhard Bonigl 1cd4f214ff Make modifiers only applicable to their valid types. Fix some inconsistencies with that. Might possibly contain bugs still. 2014-09-24 00:47:06 +02:00
Bernhard Bonigl 9d8e8128b0 Fix crash when some random people got slimesaplings with metadata. Y u do dis, people. 2014-09-23 23:09:50 +02:00
Bernhard Bonigl cbdbabd1a8 Don't render extra health when rpgHUD is present 2014-09-23 22:36:44 +02:00
Bernhard Bonigl ec02954d42 Turns out i forgot to register the effect icons for the modifiers with all the changes. ooops 2014-09-23 21:44:45 +02:00
Bernhard Bonigl 7014f265c0 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-23 21:35:40 +02:00
Bernhard Bonigl de6e3cc34b Give Armor Gear the indestructible item entity treatment. #1009 2014-09-23 18:18:30 +02:00
Bernhard Bonigl c7a0ed7fed Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-23 18:07:37 +02:00
Bernhard Bonigl 15902fbf5d Fix placing blocks with rightclick with tools not respecting creative mode #1011 2014-09-23 18:07:08 +02:00
Bernhard Bonigl 570edc802e AOE tools now behave like normal tools while sneaking. 2014-09-23 17:54:56 +02:00
Bernhard Bonigl cb7ea6f852 move baddasspigs credits to the proper credits file 2014-09-23 17:54:10 +02:00
Bernhard Bonigl c006610fea IMCs to add items to the partbuilder 2014-09-22 18:10:58 +02:00
Bernhard Bonigl e7a2fb54e2 IMC to allow adding a material + liquid to all the standard metal tool part casting stuff. 2014-09-22 17:06:24 +02:00
Bernhard Bonigl ff79f7d2da Fix drains accepting liquids even when the smeltery is full, killing said liquids. 2014-09-22 17:04:08 +02:00
Bernhard Bonigl 2610428782 Allow registration of materials via IMC 2014-09-22 16:02:16 +02:00
Bernhard Bonigl 8e0bfdd0ed Fix entities/weapons in hand not using the color modifier 2014-09-22 15:51:55 +02:00
Bernhard Bonigl 2dec0ad97f Fix hammer rendering with dynamic coloring 2014-09-22 15:51:25 +02:00
Bernhard Bonigl 1e8c0097b3 Remove the need for ToolPartHidden. 2014-09-22 14:36:50 +02:00
Bernhard Bonigl 74c92e5939 We now have dynamic toolparts with default textures, just like the tools themselves! 2014-09-22 14:29:21 +02:00
Bernhard Bonigl ec525923d4 Use custom tool renderer for every tool. Should be a minor performance incrcease if there are a lot of tools to be drawn. 2014-09-21 23:19:55 +02:00
Bernhard Bonigl ac44a51a91 Merge branch 'patch-16' of https://github.com/TheVikingWarrior/TinkersConstruct 
Conflicts:
	resources/assets/tinker/lang/it_IT.lang
 2014-09-21 22:39:03 +02:00
Bernhard Bonigl 04f21580fc Missing bow/arrow default textures 2014-09-21 18:44:44 +02:00
Bernhard Bonigl 14aebe9d84 Fix default texture being hardcoded to tinkers resources 2014-09-21 18:39:30 +02:00
Bernhard Bonigl 8e0cea23a1 Add default textures that are used if no proper texture is present. This texture is then colored with the material-color. Furthermore you can now add HandleColor, HeadColor,... tag to change the color of tool parts! 2014-09-21 17:57:53 +02:00
Bernhard Bonigl 11cd2011e8 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-20 23:15:04 +02:00
Bernhard Bonigl ea67ebc837 Patternchest drops patterns if not removed by player instead of sending them into the void 2014-09-20 23:14:54 +02:00
Bernhard Bonigl 263efb8b11 Fix division through 0 and remove some testing code 2014-09-20 14:55:46 +02:00
Bernhard Bonigl a0c0358a6b Change exposed damage back to 0-100 because it'd break the Short.MAX_VALUE limit easily 2014-09-20 14:38:17 +02:00
Bernhard Bonigl dd4f53f109 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-20 14:10:08 +02:00
Bernhard Bonigl 25261243b0 Change the damage display stuff to use NBT instead of the internal damage stuff, so we can make setItemDamage compatible with the NBT durability we use. 2014-09-20 14:09:59 +02:00
Bernhard Bonigl 61e2f1a0c3 Fix break-speed not taking harvest-tool for blocks into account (-> doesn't work with custom materials) and AOE tools not taking it into account either. 2014-09-19 22:02:29 +02:00
Bernhard Bonigl 52b365d0cf Oops. Accidently added stuff I only took a look at. :< 2014-09-19 16:54:23 +02:00
Bernhard Bonigl dfe6836955 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-09-19 15:25:51 +02:00
Bernhard Bonigl e36ba26c63 Fix dynamically added block casting only requiring 1 ingot instead of 1 block worth. #990 2014-09-19 15:25:43 +02:00
Bernhard Bonigl 9e7eec8215 Fix smeltery NPE on world startup 2014-09-19 09:01:02 +02:00
Bernhard Bonigl d5f0a513c7 Fix smeltery updates if height doesn't change and some more smeltery updating derps. 2014-09-18 23:24:51 +02:00
Bernhard Bonigl 00e3877999 Fix smeltery accidently sending updates when it's not complete yet 2014-09-18 23:14:18 +02:00
Bernhard Bonigl 3ad4aeb8b8 Update mcmod.info (remove coremod) 2014-09-18 14:35:47 +02:00
Bernhard Bonigl ff6764f252 Update forge and tinkers version for an alpha release 2014-09-18 14:26:22 +02:00
Bernhard Bonigl 083ada68bb One more smeltery crash fix with existing worlds. 2014-09-18 09:13:58 +02:00
Bernhard Bonigl 183c68c060 Update smeltery construction clientside too to get unsynchronized data when construction is in flux. 2014-09-17 22:51:47 +02:00
Bernhard Bonigl 4a9c383dd8 Backwards Compat for ToolMaterial constructor 2014-09-17 20:35:20 +02:00
Bernhard Bonigl 29f72ed357 Make AOE tools creative-mode compatible again 2014-09-17 15:59:28 +02:00
Bernhard Bonigl 619bfdb1f1 Adjust tools to new blockbreak code stuff. Yay for proper calls. 2014-09-17 15:32:51 +02:00
Bernhard Bonigl 8773232660 More fixes to AOE block harvesting. effective materials etc. 2014-09-17 14:27:52 +02:00
Bernhard Bonigl 0e76fa9c0d Add an AOE-Tool implementation that correctly calls everything vanilla style, yay. 2014-09-17 14:12:15 +02:00
Bernhard Bonigl b74776dc05 Backup Commit: HarvestTools and Hammer have exact vanilla blockbreaking behaviour, yay 2014-09-17 10:59:47 +02:00
Bernhard Bonigl ea52029236 Fix startup crash of smeltery 2014-09-17 00:24:56 +02:00
Bernhard Bonigl 218f282786 Throw custom block breaking code overboard since the forge code can handle it quite well nowadays. No change to AOE-Tools yet. 2014-09-16 23:47:54 +02:00
Bernhard Bonigl 99cb5e857f Fix Smelteries evaporating liquids when doing alloys at full capacity. Also small fix for fuel displays not working sometimes. 2014-09-16 23:38:20 +02:00
Bernhard Bonigl da996301c4 Adjust block breaking code to use vanilla behaviour. Aoe-Tools currently don't work 2014-09-16 18:49:56 +02:00
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
Bernhard Bonigl 6205894215 Add those localization changes for custom names to bow and arrow as well. 2014-09-15 22:53:23 +02: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