Commit Graph
1308 Commits
Author SHA1 Message Date
Bernhard Bonigl 5463130015 RF-Tools integration 2015-08-17 12:11:07 +02:00
Vexatos a21a80e00c Fix a crash with dynamically generated tool parts (bolts) trying to get a material name shorter than 9 characters. 2015-08-10 20:23:45 +02:00
Bernhard Bonigl ad4822465b Dead entities don't give blood in the Smeltery. Yes, testdummies. 2015-08-07 21:20:54 +02:00
Bernhard Bonigl db8f60b01e Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2015-08-07 21:18:47 +02:00
Bernhard Bonigl 50441d79c1 Prevent non-patterns being pumped into the patternchest.
Partially fixes #1684, but duping patterns is not a big deal.
2015-08-07 21:18:35 +02:00
boni ad04566799 Merge pull request #1690 from way2muchnoise/master
fixes #1468
2015-08-07 21:12:08 +02:00
boni 7eb99eb5f1 Merge pull request #1716 from mraof/master
Use the Item provided to addSmelteryMelting
2015-08-07 21:11:19 +02:00
Bernhard Bonigl 9277180b5d Add melting for weaponry stone parts.
Closing #1712
2015-08-07 21:02:51 +02:00
Bernhard Bonigl 9522da6889 NEI ? now works with crafting stations with chest and also pulls items out of the chest 2015-08-07 20:43:22 +02:00
Bernhard Bonigl 7d2fd9b346 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2015-08-07 20:42:41 +02:00
mraof a90bbfe592 Use the Item provided to addSmelteryMelting
addSmelteryMelting didn't actually use the item, now it does
2015-08-03 02:11:17 -04:00
Candice Neill 9a33c60d20 Fixed ArrayIndexOutOfBoundsException on DiamondApple getUnlocalizedName(); compressed to max 2015-08-02 11:58:18 -05:00
Candice Neill 23d81ba1ed Fixed ArrayIndexOutOfBoundsException on DiamondApple getUnlocalizedName(); tweaked to boni's specs 2015-08-02 11:11:41 -05:00
Candice Neill 7ba86b1388 Fixed ArrayIndexOutOfBoundsException on DiamondApple getUnlocalizedName() 2015-08-01 23:11:02 -05:00
Bernhard Bonigl 252662852e Add Enderium to mystcraft blacklist 2015-07-17 15:16:09 +02:00
Anton f824cc1651 Ore dict everything 2015-07-11 11:26:21 +03:00
way2muchnoise 82179a942c fixes #1468 2015-07-10 13:18:04 +02:00
boni b3004ef383 Merge pull request #1609 from tahg/patch-1
Update ArmorProxyClient.java
2015-07-02 11:58:51 +02:00
boni f0752fe33c Merge pull request #1649 from LexManos/SmelteryFix
Fix potential bounds exception in Smeltery.
2015-07-02 11:58:28 +02:00
Bernhard Bonigl a6309ef3ab Last addition for 1.7.10: alumite/ardite/cobalt/manyullyn bricks and fancy bricks 2015-06-28 12:03:41 +02:00
Bernhard Bonigl 83e71312c4 Prevent crashes with incorrectly initialized armor stuff #1668 2015-06-28 10:44:56 +02:00
Bernhard Bonigl 13db0488b5 Fix NPE in ganys PR. Closes #1675 2015-06-27 20:33:32 +02:00
ganymedes01 54d8bbcc02 Use OreDictionary chests 2015-06-25 22:31:28 -03:00
Austin Fuller df0259793e Fixed Lumber Axe Exploit
This exploit: http://youtu.be/4KW0AwXb1zk
2015-06-19 00:29:45 -05:00
LexManos 25c54b40d3 Fix potential bounds exception in Smeltery.
While playing around with trying to find the max row size of a smeltery I ran into this nice bug. Desync between capacity number and temps array.
Start out with this setup:
http://puu.sh/icShZ/041dc26b52.jpg {underneth the seared brick is more seared brick to be a valid base}
Then start digging out the trough to make the smeltery wider.
If anything falls in and updates you'll get a crash and the world won't be loadable anymore.
This little check allows for the smeltery to recover itself.
2015-06-04 19:04:39 -07:00
Bernhard Bonigl 44cede59cb Prevent corrupt projectile entities to enter the world 2015-05-10 13:26:23 +02:00
Bernhard Bonigl 455b92eb13 Add recipe sorting info for ShapelessToolRecipe (chiseling) #1574 2015-05-10 13:10:34 +02:00
Bernhard Bonigl 6361efc825 Add an extra check to projectile loading that ensures that the contained item is still valid, in case something got scrambled. 2015-05-10 13:07:07 +02:00
Bernhard Bonigl 291db565ee Yet another unchecked metadata fix. This time for tall slime grass. #1607 2015-05-10 12:57:04 +02:00
Bernhard Bonigl 2ff9efd06f Add a version requirement if armourersWorkshop is present. Seriously people, stop using outdated versions. 2015-05-10 12:56:42 +02:00
Bernhard Bonigl aaa7f0a262 Add rendering mappings for materials added through IMC. This means you can add custom textures for them. 2015-05-10 11:18:52 +02:00
Alexander 1a818f6698 Fix NullPointerException with renderArmorExtras and Bspkrs's main menu. 2015-05-08 15:02:59 -04:00
Bernhard Bonigl 2af24d5b2b Adjust pig-iron alloy ratios (1 iron + 1 emerald + some blood) #1595 2015-05-08 11:37:02 +02:00
tahg 935b378b6b Update ArmorProxyClient.java
init statics with new objects, instead of uninitialized data from playerStats
2015-05-08 04:13:46 -04:00
Bernhard Bonigl 2a72ab6c2f Add a config option to allow oregen in superflat worlds #1596 2015-05-04 21:30:40 +02:00
Bernhard Bonigl 7d3622beed Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2015-05-02 13:42:16 +02:00
Bernhard Bonigl 129fb75e4c Fix drain-comparator NPE when the controller gets broken #1586 2015-05-02 13:41:51 +02:00
boni b5ffc4229e Merge pull request #1592 from covers1624/master
Enhancement #1516: Glass panes lay down on the casting table.
2015-05-02 10:56:39 +02:00
covers1624 d900e096d7 Glass panes lay down on the casting table.
Makes Glass Panes lay down on the casting table, may need some tweaking
in regard to the location.
removed a debug log message, Herp Derp.
2015-05-02 04:14:32 +09:30
boni ec6a9f877f Merge pull request #1585 from covers1624/master
Fix for #1552
2015-05-01 20:03:01 +02:00
covers1624 b38cfee5ff Fix for #1552
The Server was not syncing the players TPlayerStats to the client until
the Armor tab was opened.
Added Packet.
Send Packet on EntityJoinEvent.

Format Derp.

Changed to Debug and added Knapsack slot output.
2015-05-01 23:33:08 +09:30
boni eb149eb094 Merge pull request #1577 from SamRaven2/CollisionFix
Right Click Placement Fix
2015-05-01 09:46:10 +02:00
SamRaven2 395a7749cc Fix For Block Collision
Fixes Accidental Suffocation
Fixes Pillaring Issue

More Work on Fix, Torch placement

Logic Derp

Less use of instanceof
More use of actual methods

Even bigger logic derp

Collision Fix
2015-04-30 16:37:21 -04:00
boni 663be2d264 Merge pull request #1584 from covers1624/master
Fixes #1561
2015-04-30 13:56:28 +02:00
covers1624 dfed1dd9f4 Fix Documentation. 2015-04-30 21:25:12 +09:30
covers1624 d77b571f23 Fixes #1561
The item in the drying rack was being rendered on the incorrect side of
the block, rotating to face the correct way then translating it to the
correct spot fixes the issue.
2015-04-30 20:25:20 +09:30
Bernhard Bonigl 9f0349c66b Fix Aluminium Brass localization name. #1575
This is how it's supposed to be, got changed on accident during refactor.
2015-04-29 20:58:28 +02:00
Bernhard Bonigl dbfb65330d Oreberries cannot be used for nugget casts or created with nugget casts anymore. Only works with actual nuggets now. #1579 2015-04-29 20:53:58 +02:00
Bernhard Bonigl fb3b662128 Oredict oreberry bushes as "orebush*" 2015-04-29 20:53:16 +02:00
Bernhard Bonigl 67ed8f4fc4 Oredict oreberries as "oreberry*" where * is the material 2015-04-29 19:00:35 +02:00