mDiyo
180ffe2ec1
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2014-08-02 15:50:49 -08:00
mDiyo
8d2e3cc1cf
Force client and server to have matching versions
2014-08-02 15:50:39 -08:00
Alexander Behrhof
580f8b086f
Changing a few things with IMC, NEI, removing buildcraft IMC
2014-08-01 23:18:45 -04:00
Alexander Behrhof
316dddbaa8
Removing anything to do with capes, adding back the NEI, and IMC plugins
2014-08-01 22:48:20 -04:00
mDiyo
f58e80425a
Merge pull request #795 from jodamm/patch-1
...
fix for blockbreaking issues with area harvesting tools
2014-07-31 14:36:47 -08:00
mDiyo
6894ba55ac
Merge pull request #785 from jodamm/master
...
fix for blockbreaking issues with single harvesting tools
2014-07-31 14:36:35 -08:00
unknown
e9822db594
unified use of block / localBlock like it is in Hammer.
...
block harvesting is in own method in HarvestTool except the scythe.
fix for some blocks drop nothing or not breaking at all.
fix for dropping exp with silktouch.
2014-07-31 21:32:12 +02:00
Bernhard Bonigl
0160d7c889
Oh god how did I not notice this when I fixed the mistyped string.
2014-07-31 18:09:19 +02:00
Bernhard Bonigl
bb77a11227
Fix buckets not picking up molten metals
2014-07-31 16:38:47 +02:00
jodamm
2f5910c08e
removed localBlock and localMeta in HarvestTool.java because block and localBlock is always the same.
...
moved the block harvesting in own method
fixes some blocks not droping or not breaking at all.
fixes exp drop with silktouch
2014-07-30 21:33:42 +02:00
Bernhard Bonigl
527934d277
Bugfix: It was possible to add more than <maxamount> to redstone/lapis/... modifiers if they were exactly at a lvlup threshold
2014-07-30 13:31:13 +02:00
Bernhard Bonigl
f6877b55cb
Bugfix: Blaze modifier didn't stack its levels properly. Broke after 1st level because it only checked for it's first maximum.
2014-07-30 12:54:16 +02:00
Bernhard Bonigl
2089804266
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2014-07-30 10:52:40 +02:00
Bernhard Bonigl
f1ba2b2c50
ModIntegration: Fix CertusQuartz not being registered correctly as Attack Modifier
2014-07-30 10:52:17 +02:00
mDiyo
bb70b06b98
Add comment for magic number in HarvestTool
2014-07-29 08:00:18 -08:00
mDiyo
feb66142f1
Merge pull request #774 from Glassmaker/patch-multifixes
...
Multifixes: cleaver's mining fatigue & melting glueballs into gold
2014-07-27 17:49:29 -08:00
Glassmaker
d76117d559
Adds dropping experiance when breaking blocks, example Coal and Lappis
2014-07-28 00:39:37 +03:00
Bernhard Bonigl
4de655f533
Fix bug that ALWAYS added null to the ToolMaterials when using addtoolMaterial(int, ToolMaterial)
2014-07-27 19:58:07 +02:00
Glassmaker
efc9208abf
Fixed melting glueballs into gold
2014-07-27 03:23:40 +03:00
Glassmaker
47726d1923
Fixed the clever's mining fatigue still active after throwing the cleaver, closes #731
2014-07-27 03:06:30 +03:00
mDiyo
efbed8af88
Merge pull request #772 from Glassmaker/patch-multifixes
...
Multifixes
2014-07-26 12:02:45 -08:00
Glassmaker
498e0d8be7
Moved steping to server side, and fixed high step effect after removing the boots
2014-07-26 22:57:54 +03:00
Zerokyuuni
bc169265ff
And the gemcast because pearl hurr hurr
...
And metafix because counting is hard
2014-07-26 15:01:56 -04:00
Zerokyuuni
f9f3259ab2
Let's fry us up some Enderballs, y'all
...
Tasty :V
2014-07-26 14:48:23 -04:00
Glassmaker
b4c649c2e6
Enabled armour modifiers
2014-07-26 21:00:43 +03:00
Zerokyuuni
115fad9b09
No more NBT Localization for modifiers
2014-07-26 13:28:50 -04:00
mDiyo
cb51f1e1b4
Fix wings ability tooltip
2014-07-21 13:12:38 -08:00
mDiyo
6f324bcbcb
Fix metal blocks not working as beacon bases
2014-07-21 13:09:22 -08:00
mDiyo
d891a26250
Finish controls on travel gear
2014-07-21 12:52:39 -08:00
Alexander Behrhof
ea634c139f
Reverting "Fix some block breaking problems".
2014-07-21 15:07:16 -04:00
mDiyo
c43bbf10a5
Merge pull request #758 from squeek502/food-fixes
...
Made SpecialFood use 1.7.10 methods to get hunger/saturation values and fixed bacon crash
2014-07-20 19:59:57 -08:00
mDiyo
6e5bbf15d4
Merge pull request #755 from Glassmaker/patch-hammer
...
Fixes the hammer's adjacent blocks mining level, closes #751
2014-07-20 19:59:30 -08:00
squeek
fdac54cd7e
Made SpecialFood use 1.7.10 methods to get hunger/saturation values and fixed bacon crash
...
Closes SlimeKnights/TinkersConstruct#729
2014-07-20 17:41:15 -07:00
squeek
6b2e266022
Fixed TinkerTools.modIntegration not being called
...
Fixes SlimeKnights/TinkersConstruct#734
2014-07-20 17:21:32 -07:00
Glassmaker
1a4f9d0e92
Fixes the hammer's adjacent blocks mining level, closes #751
2014-07-20 05:27:32 +03:00
mDiyo
beffc0b162
Merge pull request #747 from bonii-xx/master
...
Change harvest speed calculation to be accessible from subtypes.
2014-07-15 16:46:11 -08:00
Glassmaker
eb50bb90f3
Fixed Lava (Fuel) gague in the smeltery
2014-07-15 22:30:03 +03:00
Bernhard Bonigl
92f6e1405f
Add a public isEffective to HarvestTool. Allows outside checking whether a tool is effective vs. a material.
2014-07-15 21:18:09 +02:00
Bernhard Bonigl
313b49181f
Make calculateStrength of harvestTool public (was package? forgotten access modifier?)
2014-07-15 20:59:11 +02:00
Glassmaker
582c9e9f59
Fixed changing fluids in tanks on restarting the game
2014-07-15 09:42:20 +03:00
Glassmaker
ea12d67f9c
Fixed items dropping while clicking chest inventory in crafting station/tinkers table, and display order for large chests, closes #698
2014-07-14 23:56:41 +03:00
Glassmaker
6983322b9b
Fixed accumulating fall damage in bounce pads, and step sound
2014-07-14 13:12:11 +03:00
Glassmaker
ad79a806f0
Fixed flammabilty of bricks and fancy bricks
2014-07-14 03:35:09 +03:00
Glassmaker
ce7852bb20
Fixed Smeltery GUI click and drag
2014-07-14 02:17:38 +03:00
Glassmaker
0f0af93d1a
Fixes idle bow sprite
2014-07-14 01:54:03 +03:00
Glassmaker
84744e0404
Shifts villager initializaion after pulsar's preinit, fixes crash on opening villager trade window, closes #719
2014-07-13 13:58:04 +03:00
mDiyo
b6d8e1fd31
Merge pull request #730 from Glassmaker/patch-4
...
Fixed Localizations in Smeltery Tooltip and WAILA
2014-07-12 10:02:05 -08:00
mDiyo
1affd6d909
Merge pull request #724 from squeek502/1.7.10-merge-1.6.4
...
Merge some unmerged pull requests from 1.6.4 branch
2014-07-12 10:01:35 -08:00
Glassmaker
46fbe04920
Fixed Localizations in Smeltery Tooltip and WAILA
2014-07-10 13:23:31 +03:00
squeek
4a8ca08fac
Compile fixes for 1.7.10
2014-07-07 00:16:47 -07:00
mDiyo