Commit Graph
38 Commits
Author SHA1 Message Date
Sunstrike 08fd425c8f Fix wtf code merge.
Removed extra brackets from StatCollector references (PLEASE check this before PRs), replaced TContent references with TRepo as needed.
2013-12-01 21:42:03 +00:00
TheVikingWarrior 1c4f112c71 Update ToolStationGui.java 2013-12-01 20:42:05 +01:00
TheVikingWarrior 3633f4bbee Update ToolForgeGui.java 2013-12-01 20:41:33 +01:00
TheVikingWarrior ea218c6099 Update StencilTableGui.java 2013-12-01 20:40:42 +01:00
TheVikingWarrior f7081180d3 Update SmelteryGui.java 2013-12-01 20:40:08 +01:00
TheVikingWarrior 0ff2ea0eeb Update PartCrafterGui.java 2013-12-01 20:39:36 +01:00
TheVikingWarrior e29d9eb111 Update AdaptiveSmelteryGui.java 2013-12-01 20:38:58 +01:00
Sunstrike cc241aab67 Abort cloak render with Optifine. 2013-12-01 13:49:48 +00:00
Sunstrike e763bb6363 Move some stuff out into Mantle. 2013-12-01 12:19:43 +00:00
Sunstrike f68a27be28 Bad Magic Launcher, bad! *whacks* 2013-11-30 19:50:18 +00:00
Progwml6 a32ac02b9c clean up fluids & fluidBlocks variable declaration 2013-11-30 13:35:54 -05: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
Progwml6 a13b5396d4 missed these in refactoring 2013-11-30 09:48:30 -05: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
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 bb0db29ce8 update to Master commit bef5782
remove mod E from books
2013-11-26 07:08:06 -05:00
Progwml6 721e30b641 Change how crafting tables are registered
commit 4db51de
2013-11-25 20:02:35 -05:00
Progwml6 f693ee75e0 update to 1.5.1 RC2 c2cdb7 2013-11-25 19:40:43 -05: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
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
Progwml6 14d357ccf6 manual merge of master branch changes up to commit 1387bc6 2013-11-23 09:31:19 -05:00
Progwml6 707f7996b5 method doesnt need override anymore 2013-11-22 22:44:02 -05:00
Progwml6 ac77676a85 maven based systems wont package api's storedd in this manner 2013-11-22 05:42:24 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00