Commit Graph
1128 Commits
Author SHA1 Message Date
Sunstrike 35367bb1fd Transition old IMC plugins to new compat loader.
These old ones need to be removed still and all TContent refs need updated in these when refactor occurs.
2013-11-29 20:33:49 +00:00
Sunstrike 3b3b439cfb Transition to using FML's suggested config file, not Tinkers Workshop.txt 2013-11-29 19:52:03 +00:00
Sunstrike 4698b28179 TDynstruct.cfg can now be used to toggle compat plugins. 2013-11-29 19:46:40 +00:00
Sunstrike bd213f60d9 Silly IDEA and Vim junk... 2013-11-29 19:46:13 +00:00
Progwml6 241bfcf0d5 fix another merge derp 2013-11-28 16:33:14 -05: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 04cc69b042 update readme to reflect gradle setup 2013-11-27 06:29:41 -05:00
Progwml6 2e9969729b mod for MC 1.6.x is now final. Please submit any PR's to the gradle branch until you see a build.gradle file in the root of the master branch 2013-11-27 06:12:23 -05: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
Zach a7a5274ffe Merge pull request #359 from VeryBigBro/patch-4
Update ru_RU.lang
2013-11-26 06:09:06 -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
Progwml6 721e30b641 Change how crafting tables are registered
commit 4db51de
2013-11-25 20:02:35 -05:00
mDiyo 4db51de036 Change how crafting tables are registered 2013-11-25 16:56:07 -08:00
Progwml6 f693ee75e0 update to 1.5.1 RC2 c2cdb7 2013-11-25 19:40:43 -05:00
mDiyo c2cdb77edd Fix stencil table for real 2013-11-25 16:29:41 -08:00
mDiyo 8cdc9235e4 Fix emerald positive feedback loop 2013-11-25 16:22:52 -08:00
mDiyo 62bc292779 mDiyo shakes fist at commas 2013-11-25 16:19:07 -08:00
mDiyo d1b80be94e RC2 2013-11-25 16:11:20 -08:00
Progwml6 c429d8e6c5 swap flux into the electric modifiers old spots in the client proxy 2013-11-25 19:07:59 -05:00
Progwml6 f2da066da2 update to tcon 1.5.1RC1 commits 2013-11-25 18:57:54 -05:00
mDiyo 422237385a Adjust drink values on blood 2013-11-25 15:43:35 -08:00
Progwml6 0c1de90e0d Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-25 18:35:18 -05:00
Progwml6 7279bbf2d5 actually register the new handler 2013-11-25 18:35:02 -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 21aee0c9cf update MFR api, add in blood as drinkable closes #350 2013-11-25 18:30:14 -05:00
Progwml6 6a898f97d7 update de_DE from master 2013-11-25 17:15:14 -05:00
Zach 23a6416543 Merge pull request #355 from Vexatos/patch-2
Pig iron + sweet irony == I hate English puns. Can not translate those :(
2013-11-25 14:08:41 -08: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
Sunstrike ca86fa895a Add InventoryLogic constructor for max stack size, reconf drying rack to use it. 2013-11-25 18:15:40 +00:00
Zach 08869c23f4 Merge pull request #353 from TheVikingWarrior/patch-4
Glue
2013-11-25 09:23:19 -08: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 1fc707f5fe Add grout melting recipe 2013-11-25 04:21:51 -08:00