Commit Graph
1152 Commits
Author SHA1 Message Date
Sunstrike ef70d27bee Update Mantle. 2013-12-01 12:18:50 +00:00
Progwml6 16c6b6a532 welcome back Mantle 2013-11-30 18:47:49 -05:00
Sunstrike c037a13f18 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-30 19:55:07 +00:00
Sunstrike f68a27be28 Bad Magic Launcher, bad! *whacks* 2013-11-30 19:50:18 +00:00
Progwml6 469c1c62d9 version #'s for dependencies now loaded from properties file 2013-11-30 14:47:58 -05:00
Sunstrike f3b31b7914 Fix Git not finishing fast enough in build.gradle 2013-11-30 19:09:12 +00:00
Sunstrike 587ba53a36 Change root project ID to match Ant 2013-11-30 18:55:12 +00:00
Sunstrike 5b8311a882 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-30 18:47:04 +00:00
Sunstrike 5012c3a60c GITBORK if Git isn't working. 2013-11-30 18:46:53 +00:00
Progwml6 a32ac02b9c clean up fluids & fluidBlocks variable declaration 2013-11-30 13:35:54 -05:00
Sunstrike de0a33fcdd Slightly tweak builder output format 2013-11-30 18:23:46 +00:00
Sunstrike 7c68cfbcc5 Update preloader to 0.1.1
Restore AT function (went missing in a merge), add verbose log toggle, reinforce PropertyManager.
2013-11-30 17:59:28 +00:00
Sunstrike ec005e14ad Fix recipes crash 2013-11-30 17:57:22 +00:00
Sunstrike f77f89e208 Cleanup dimension blacklist. 2013-11-30 17:06:50 +00:00
Zach e46e57c9ca Merge pull request #364 from Vexatos/patch-2
Update de_DE.lang
2013-11-30 07:36:06 -08:00
Progwml6 a13b5396d4 missed these in refactoring 2013-11-30 09:48:30 -05:00
Vexatos 6f0fa31cc5 Update de_DE.lang 2013-11-30 11:16:06 +01:00
Progwml6 b6da5dcca4 clean up imports, run TContent/ new classes through formatter 2013-11-29 23:50:14 -05:00
Progwml6 b79ed2c933 more of tcontent refactors 2013-11-29 23:46:55 -05:00
Progwml6 f31e0cd2e5 part 1A 2013-11-29 23:19:39 -05:00
Progwml6 6671cd9a3f Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-29 23:16:44 -05:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Sunstrike ca4f4205d2 Force Mystcraft plugin to load unconditionally.
This cannot be overridden by TDynstruct.cfg for balance sake.
2013-11-29 21:10:58 +00:00
Sunstrike dfde917a39 Less noise please. I think the comedy message is sufficient now. 2013-11-29 20:39:07 +00:00
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