Commit Graph
2423 Commits
Author SHA1 Message Date
mDiyo 7fd1770413 Merge pull request #707 from progwml6/master
Configuration file compatibility for 1.6.4 and 1.7.2
2014-06-30 18:06:48 -08:00
progwml6 75ea8723ee update pulsar handling to use pulsars autogenerated configs
use .cfg file for tcon -- legacy one should be renamed if it is the only one present
only save config files if they have actually changed
2014-06-30 21:52:31 -04:00
mDiyo 3de90bded2 Modularize TConstruct using Pulsar 2014-06-30 14:57:06 -08:00
mDiyo edfe9ae7d4 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-06-30 09:45:54 -08:00
mDiyo ffd6e8d60b Merge pull request #660 from fabricator77/patch-1
Fix foundation size on ComponentToolWorkshop
2014-06-30 09:28:30 -08:00
mDiyo 20d79aa8b0 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-06-30 09:28:00 -08:00
mDiyo 306499c0c9 Merge pull request #706 from nolimet/patch-1
Fixed a spelling error as discribed in issue  #705
2014-06-30 09:23:26 -08:00
mDiyo 145f7b9724 Fix merge conflicts 2014-06-30 09:22:30 -08:00
Jesse Stam 2cc8108d19 Fixed a spelling error as discribed in issue #705 2014-06-30 17:14:44 +02:00
Alexander Behrhof 6ca6f9eacf Updating to 1.7.10 :D Fixing glass 2014-06-26 16:41:18 -04:00
Alexander Behrhof bef0d9f48d Merge pull request #702 from TheVikingWarrior/patch-8
Update it_IT.lang
2014-06-26 16:18:26 -04:00
TheVikingWarrior 716b06bbe6 Update it_IT.lang 2014-06-26 20:03:34 +02:00
Alexander Behrhof 504a44a4f0 Merge pull request #701 from 61352151511/master
Fix ManyullynDust typo
2014-06-26 12:18:51 -04:00
61352151511 499906beb1 Fix ManyullynDust typo
I'm bad at typing D:
2014-06-26 09:59:32 -03:00
Alexander Behrhof abee2c0c91 Merge pull request #700 from 61352151511/master
Add Localizations for Dusts
2014-06-25 22:40:55 -04:00
61352151511 d3a0fe679c Fix Average Shot Damage Tooltip 2014-06-25 22:35:22 -03:00
61352151511 379af72147 Add Localizations for Dusts 2014-06-25 22:19:15 -03:00
Alexander Behrhof 389b41c8a1 Merge pull request #693 from blue42u/patch-mining
Fix some block breaking problems.
2014-06-25 21:07:13 -04:00
Alexander Behrhof 9c4aa7af61 Merge pull request #680 from laz2727/master
Some fixes for OreDictionary "ores" (Forge 1088+)
2014-06-25 21:05:14 -04:00
Alexander Behrhof caf084edca Updating to 1.7.10_pre4 2014-06-25 21:01:20 -04:00
Alexander Behrhof 3a127a7bf0 Fix missing aluminium_dust texture, It should of been aluminum_dust. 2014-06-21 13:38:24 -04:00
blue42u b16b79a823 Fix some block breaking problems.
- Bibliocraft locks are respected.
- Fixes Thaumcraft node drops.
- Fixes strange auto-smelt drops sometimes.
- Probably fixes sync issues somewhere.
2014-06-14 09:31:39 -05:00
Alexander Behrhof 01ac924123 Revert BlueSlime Change 2014-06-08 14:39:35 -04:00
Alexander Behrhof 1278298d7c Changing getAABBPool().getAABB( -> getBoundingBox( 2014-06-08 14:37:02 -04:00
Alexander Behrhof d9cf30f767 Merge pull request #682 from Zerokyuuni/patch-1
Fix Mod ID with GregTech
2014-06-07 21:38:30 -04:00
mDiyo 5a87c102ea Split more files into parts 2014-06-06 19:46:05 -08:00
Zerokyuuni a63f020dbb Fix Mod ID 2014-06-06 21:13:53 -04:00
ΛAZ27 c84efa0580 Some fixes for oreDict F.1088 2014-06-06 13:52:08 +06:00
mDiyo e2f0558b6f Reorganize folders for modules 2014-06-04 21:44:48 -08:00
Alexander Behrhof 2c14f315de Remove what prog moved into Mantle, Bump Forge Version 2014-06-01 21:20:12 -04:00
mDiyo 54dda43dcf Fix memory leak by removing packet out 2014-06-01 19:01:43 +00:00
mDiyo c27f1932bc Merge pull request #655 from blue42u/patch-forge-gui
Fix the Tool Forge Gui!
2014-05-31 08:38:48 -07:00
mDiyo 99206ea62f Merge pull request #657 from blue42u/patch-tabs
Fix them tabs!
2014-05-31 08:38:40 -07:00
mDiyo d5912faf8a Merge pull request #659 from TheVikingWarrior/patch-6
Update it_IT.lang
2014-05-31 08:36:02 -07:00
mDiyo 329ab5dcb7 Merge pull request #665 from Adaptivity/patch-1
Probably latest changes(master)
2014-05-31 08:35:47 -07:00
mDiyo cf794a376f Merge pull request #670 from CoderPuppy/patch-1
Fix the battlesign crashing when blocking a DamageSource with no entity
2014-05-31 08:35:00 -07:00
Drew b8ab91532d Fix the battlesign crashing
when blocking a DamageSource with no entity
2014-05-27 22:57:30 -04:00
Anton 03c06bc71b Update ru_RU.lang 2014-05-23 17:29:53 +04:00
Anton 0b3e212a60 Update ru_RU.lang 2014-05-23 17:13:34 +04:00
fabricator77 4f87d1d4db Fix foundation size on ComponentToolWorkshop
Foundation didn't match up with the size of hut itself
2014-05-20 20:22:19 +09:30
TheVikingWarrior dfe3ad11f6 Update it_IT.lang 2014-05-19 14:10:55 +02:00
Alexander Behrhof 3b1ca5d6d4 Merge pull request #653 from blue42u/patch-42
Fix the Pattern Achievement and the Barrel O' Manuals!
2014-05-16 08:47:34 -04:00
blue42u 625f42f05c Fix them tabs! 2014-05-16 07:22:45 -05:00
blue42u fc2fdff25b Fix the Tool Forge Gui! 2014-05-14 09:52:04 -05:00
blue42u 0714879940 Fix the Pattern Achieve and the Barrel O' Manuals! 2014-05-13 16:19:15 -05:00
Progwml6 63b740eacd restore te3 recipe plugin 2014-05-10 17:28:30 -04:00
Progwml6 546cc2198e bump forge/mantle versions, restore waila integration 2014-05-10 16:50:27 -04:00
Zach 6b51e9c072 Merge pull request #648 from blue42u/patch-all-the-things
Fix the chisel, achieves, punji...
2014-05-09 14:04:22 -04:00
blue42u ca00652ad7 Really Remove all ItemStack == ItemStack and ComparisonHelper references. 2014-05-09 12:35:55 -05:00
Zach 4399b4f26e Merge pull request #642 from vanzomerenc/patch-1
fix pigiron/glue buckets (resolves issue #639)
2014-05-08 22:50:31 -04:00