Commit Graph
204 Commits
Author SHA1 Message Date
Vexatos 6f0fa31cc5 Update de_DE.lang 2013-11-30 11:16:06 +01:00
Progwml6 07062a59d1 fix merge derps 2013-11-27 17:14:47 -05:00
Sunstrike 6ad0723020 Merge 1.7 prep into master.
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <[email protected]>
2013-11-27 17:46:07 +00:00
Progwml6 08c4c38e9f update to 32e8014 2013-11-27 06:02:29 -05:00
Zach 32e80149b8 Merge pull request #360 from TheVikingWarrior/patch-1
Patch 1
2013-11-26 06:10:12 -08:00
TheVikingWarrior aea34f2230 Update it_IT.lang 2013-11-26 14:46:33 +01:00
TheVikingWarrior c40d3b835a Update it_IT.lang 2013-11-26 14:45:40 +01:00
TheVikingWarrior 0a976bef50 Update en_US.lang 2013-11-26 14:36:03 +01:00
Anton b9cb37d7d3 Update ru_RU.lang 2013-11-26 16:32:53 +03:00
Progwml6 bb0db29ce8 update to Master commit bef5782
remove mod E from books
2013-11-26 07:08:06 -05:00
Progwml6 bef57829f3 manual insertion of PR #354 from @TheVikingWarrior 2013-11-26 07:06:20 -05:00
mDiyo 453c01e798 Merge pull request #357 from crafteverywhere/patch-3
Update zh_CN.lang
2013-11-26 02:29:37 -08:00
mDiyo 5d0af2ca90 Merge pull request #358 from VeryBigBro/patch-3
Update ru_RU.lang
2013-11-26 02:29:30 -08:00
Progwml6 378b9f0e9c add flux modifier to book, warning about electric being deprecated 2013-11-26 05:26:25 -05:00
mDiyo a82adc690d Add fluid.glue localization 2013-11-26 00:28:11 -08:00
Anton a1eea2f9c0 Update ru_RU.lang 2013-11-26 09:26:34 +03:00
Anton 892e79e727 Update ru_RU.lang 2013-11-26 09:24:12 +03:00
crafteverywhere 2b8bc7363f Update zh_CN.lang 2013-11-26 12:52:07 +08:00
mDiyo d1b80be94e RC2 2013-11-25 16:11:20 -08:00
Progwml6 f2da066da2 update to tcon 1.5.1RC1 commits 2013-11-25 18:57:54 -05:00
mDiyo d5131802b5 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-25 15:33:06 -08:00
mDiyo bd40202cf0 Add more descriptions to books and tooltips 2013-11-25 15:32:42 -08:00
Progwml6 6a898f97d7 update de_DE from master 2013-11-25 17:15:14 -05:00
Progwml6 b8bd6259ee retire modElectric 2013-11-25 15:36:32 -05:00
Progwml6 983c91c2c9 manual update of all master commits up to ca86fa8 2013-11-25 14:08:18 -05:00
Vexatos c965054474 Update de_DE.lang 2013-11-25 20:04:31 +01:00
TheVikingWarrior 1c44e54576 Update it_IT.lang 2013-11-25 13:54:57 +01:00
TheVikingWarrior 4fcd0dbe62 Glue 2013-11-25 13:44:13 +01:00
mDiyo 6e3e272faf Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-24 23:26:23 -08:00
mDiyo d9a316284e Stencil table fix, glue ingots changed to balls and reregistered 2013-11-24 23:24:56 -08:00
TheVikingWarrior 43124a4442 Tooltips in italian :D 2013-11-24 09:54:19 +01:00
mDiyo 728a49714d Merge pull request #345 from TheVikingWarrior/patch-2
Update it_IT.lang
2013-11-23 23:17:38 -08:00
mDiyo 9ebcbe031d Merge pull request #346 from TheVikingWarrior/patch-1
Localized Tooltips
2013-11-23 23:17:28 -08:00
TheVikingWarrior 2db60ea8a1 Update it_IT.lang 2013-11-23 19:15:56 +01:00
Anton a4838078f2 Update ru_RU.lang
And again
2013-11-23 19:35:48 +03:00
Sunstrike 5d4ed1842d Update en_US.lang
Forgot a few localisations.
2013-11-23 16:26:38 +00:00
Anton 900d1332c5 Update ru_RU.lang 2013-11-23 19:16:47 +03:00
Sunstrike decbb7d01f More gluey things.
Glue blocks can be melted in the smeltery, and casted into blocks with the basin. Buckets too.
2013-11-23 15:48:19 +00:00
Progwml6 14d357ccf6 manual merge of master branch changes up to commit 1387bc6 2013-11-23 09:31:19 -05:00
Sunstrike 1387bc6f74 Glue block 2013-11-23 14:09:08 +00:00
mDiyo 3041f43223 Fix Smeltery causing massive updates 2013-11-22 13:46:43 -08:00
TheVikingWarrior e0026c3539 tooltips 2013-11-22 15:25:49 +01:00
TheVikingWarrior fbd493dc0b Update it_IT.lang 2013-11-22 13:31:49 +01:00
mDiyo 29354ba3f4 Gem cast, more misc fixes 2013-11-21 22:34:47 -08:00
Progwml6 0e7c20308d stop SS from acting like a 2 yr old 2013-11-21 19:59:31 -05:00
Progwml6 dc4bbb8c4d move AT, DL CB's stuff 2013-11-21 18:47:02 -05:00
Sunstrike e5dd0d2423 Make AT active at runtime for Gradle-ised Forges. 2013-11-21 18:38:43 +00:00
TheVikingWarrior 612dc7dc66 Fixed scythe head icon on the 2nd manual
http://www.minecraftforum.net/topic/1659892-164tinkers-construct/page__st__6700

RichardJCox:

Second (minor): That isn't a scythe part in book 2:
2013-11-21 14:19:27 +01:00
TheVikingWarrior 4b40d9704b Update it_IT.lang 2013-11-20 22:29:46 +01:00
mDiyo 7a8836adae Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-19 20:58:36 -08:00